aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2008-04-24 03:59:25 -0400
committerDavid S. Miller <davem@davemloft.net>2008-04-24 03:59:25 -0400
commit3d36696024499aef19dbf24a781e91a24fbbe4af (patch)
tree2d999dfee2897123f6fb16e2a75327ac8db2020d /net
parentc9c1014b2bd014c7ec037bbb6f58818162fdb265 (diff)
[AF_UNIX] Initialise UNIX sockets before general device initcalls
When drivers call request_module(), it tries to do something with UNIX sockets and triggers a 'runaway loop modprobe net-pf-1' warning. Avoid this by initialising AF_UNIX support earlier. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/unix/af_unix.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 2851d0d15048..63ed69ffad99 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2193,7 +2193,11 @@ static void __exit af_unix_exit(void)
2193 unregister_pernet_subsys(&unix_net_ops); 2193 unregister_pernet_subsys(&unix_net_ops);
2194} 2194}
2195 2195
2196module_init(af_unix_init); 2196/* Earlier than device_initcall() so that other drivers invoking
2197 request_module() don't end up in a loop when modprobe tries
2198 to use a UNIX socket. But later than subsys_initcall() because
2199 we depend on stuff initialised there */
2200fs_initcall(af_unix_init);
2197module_exit(af_unix_exit); 2201module_exit(af_unix_exit);
2198 2202
2199MODULE_LICENSE("GPL"); 2203MODULE_LICENSE("GPL");