rpms/kernel/devel linux-2.6-net-label_4_7.patch,1.1.2.1,1.1.2.2

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Jun 21 20:55:30 UTC 2006


Author: sgrubb

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24098

Modified Files:
      Tag: private-lspp-37-branch
	linux-2.6-net-label_4_7.patch 
Log Message:
take the __init and __exit modifiers off 2 functions


linux-2.6-net-label_4_7.patch:
 include/net/netlabel.h             |  434 +++++++++++++++++++++++
 net/Kconfig                        |    2 
 net/Makefile                       |    3 
 net/netlabel/Kconfig               |   47 ++
 net/netlabel/Makefile              |   19 +
 net/netlabel/netlabel_domainhash.c |  629 +++++++++++++++++++++++++++++++++
 net/netlabel/netlabel_domainhash.h |   64 +++
 net/netlabel/netlabel_kapi.c       |  392 +++++++++++++++++++++
 net/netlabel/netlabel_mgmt.c       |  689 +++++++++++++++++++++++++++++++++++++
 net/netlabel/netlabel_mgmt.h       |  248 +++++++++++++
 net/netlabel/netlabel_user.c       |  162 ++++++++
 net/netlabel/netlabel_user.h       |   67 +++
 12 files changed, 2756 insertions(+)

Index: linux-2.6-net-label_4_7.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Attic/linux-2.6-net-label_4_7.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-net-label_4_7.patch	21 Jun 2006 20:34:19 -0000	1.1.2.1
+++ linux-2.6-net-label_4_7.patch	21 Jun 2006 20:55:27 -0000	1.1.2.2
@@ -770,7 +770,7 @@
 + * values on error.
 + *
 + */
-+int __init netlbl_domhsh_init(const u32 size)
++int netlbl_domhsh_init(const u32 size)
 +{
 +	u32 iter;
 +	struct netlbl_domhsh_tbl *hsh_tbl;
@@ -1298,8 +1298,8 @@
 +};
 +
 +/* init/exit functions */
-+int netlbl_domhsh_init(const u32 size) __init;
-+void netlbl_domhsh_exit(void) __exit;
++int netlbl_domhsh_init(const u32 size) ;
++void netlbl_domhsh_exit(void) ;
 +
 +/* Manipulate the domain hash table */
 +int netlbl_domhsh_add(struct netlbl_dom_map *entry);
@@ -1652,7 +1652,7 @@
 + * Perform the initialization of the NetLabel module before first use.
 + *
 + */
-+static int __init netlbl_init(void)
++static int netlbl_init(void)
 +{
 +	int ret_val = 0;
 +
@@ -1699,7 +1699,7 @@
 + * Perform any cleanup required before removing the NetLabel module.
 + *
 + */
-+static void __exit netlbl_exit(void)
++static void netlbl_exit(void)
 +{
 +	netlbl_netlink_exit();
 +	netlbl_domhsh_exit();
@@ -2755,7 +2755,7 @@
 + * success and non-zero on failure.
 + *
 + */
-+int __init netlbl_netlink_init(void)
++int netlbl_netlink_init(void)
 +{
 +	/* XXX - it might be a good idea to spawn a thread here at startup to
 +	   handle the updates to the label mapping databases and have the
@@ -2885,8 +2885,8 @@
 +
 +/* NetLabel NETLINK I/O functions */
 +
-+int netlbl_netlink_init(void) __init;
-+void netlbl_netlink_exit(void) __exit;
++int netlbl_netlink_init(void) ;
++void netlbl_netlink_exit(void) ;
 +int netlbl_netlink_snd(struct sk_buff *skb, const u32 pid);
 +int netlbl_netlink_snd_multicast(struct sk_buff *skb,
 +				 const u32 pid,




More information about the fedora-cvs-commits mailing list