diff options
| author | Andi Kleen <ak@suse.de> | 2005-12-22 15:43:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-03 16:11:14 -0500 |
| commit | 77d76ea310b50a9c8ff15bd290fcb4ed4961adf2 (patch) | |
| tree | 7d6e8b2426d4b3debe5ddf838ab2a2ef13f1b106 /init | |
| parent | 7708610b1bff4a0ba8a73733d3c7c4bda9f94b21 (diff) | |
[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 'init')
| -rw-r--r-- | init/main.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/init/main.c b/init/main.c index 27f97f9b4636..54aaf561cf66 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | #include <linux/rmap.h> | 47 | #include <linux/rmap.h> |
| 48 | #include <linux/mempolicy.h> | 48 | #include <linux/mempolicy.h> |
| 49 | #include <linux/key.h> | 49 | #include <linux/key.h> |
| 50 | #include <net/sock.h> | ||
| 51 | 50 | ||
| 52 | #include <asm/io.h> | 51 | #include <asm/io.h> |
| 53 | #include <asm/bugs.h> | 52 | #include <asm/bugs.h> |
| @@ -614,9 +613,6 @@ static void __init do_basic_setup(void) | |||
| 614 | sysctl_init(); | 613 | sysctl_init(); |
| 615 | #endif | 614 | #endif |
| 616 | 615 | ||
| 617 | /* Networking initialization needs a process context */ | ||
| 618 | sock_init(); | ||
| 619 | |||
| 620 | do_initcalls(); | 616 | do_initcalls(); |
| 621 | } | 617 | } |
| 622 | 618 | ||
