summaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2005-12-22 12:43:42 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-01-03 13:11:14 -0800
commit77d76ea310b50a9c8ff15bd290fcb4ed4961adf2 (patch)
tree7d6e8b2426d4b3debe5ddf838ab2a2ef13f1b106 /net/socket.c
parent7708610b1bff4a0ba8a73733d3c7c4bda9f94b21 (diff)
downloadkernel-crypto-77d76ea310b50a9c8ff15bd290fcb4ed4961adf2.tar.gz
kernel-crypto-77d76ea310b50a9c8ff15bd290fcb4ed4961adf2.tar.xz
kernel-crypto-77d76ea310b50a9c8ff15bd290fcb4ed4961adf2.zip
[NET]: Small cleanup to socket initialization
sock_init can be done as a core_initcall instead of calling it directly in init/main.c Also I removed an out of date #ifdef. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/socket.c')
-rw-r--r--net/socket.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/socket.c b/net/socket.c
index 3145103cdf5..98be7ef3c08 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2036,7 +2036,7 @@ int sock_unregister(int family)
return 0;
}
-void __init sock_init(void)
+static int __init sock_init(void)
{
/*
* Initialize sock SLAB cache.
@@ -2044,12 +2044,10 @@ void __init sock_init(void)
sk_init();
-#ifdef SLAB_SKB
/*
* Initialize skbuff SLAB cache
*/
skb_init();
-#endif
/*
* Initialize the protocols module.
@@ -2058,8 +2056,8 @@ void __init sock_init(void)
init_inodecache();
register_filesystem(&sock_fs_type);
sock_mnt = kern_mount(&sock_fs_type);
- /* The real protocol initialization is performed when
- * do_initcalls is run.
+
+ /* The real protocol initialization is performed in later initcalls.
*/
#ifdef CONFIG_NETFILTER
@@ -2067,6 +2065,8 @@ void __init sock_init(void)
#endif
}
+core_initcall(sock_init); /* early initcall */
+
#ifdef CONFIG_PROC_FS
void socket_seq_show(struct seq_file *seq)
{