---

yaml --- r: 92007 b: refs/heads/master c: 3d36696 h: refs/heads/master i: 92005: f350cce 92003: b269d76 91999: c380add v: v3
git-mirror · Apr 24, 2008 · 4cd9fbf · 4cd9fbf
1 parent c8cc18b
commit 4cd9fbf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9c1014b2bd014c7ec037bbb6f58818162fdb265
+refs/heads/master: 3d36696024499aef19dbf24a781e91a24fbbe4af
diff --git a/trunk/net/unix/af_unix.c b/trunk/net/unix/af_unix.c
@@ -2193,7 +2193,11 @@ static void __exit af_unix_exit(void)
 	unregister_pernet_subsys(&unix_net_ops);
 }
 
-module_init(af_unix_init);
+/* Earlier than device_initcall() so that other drivers invoking
+   request_module() don't end up in a loop when modprobe tries
+   to use a UNIX socket. But later than subsys_initcall() because
+   we depend on stuff initialised there */
+fs_initcall(af_unix_init);
 module_exit(af_unix_exit);
 
 MODULE_LICENSE("GPL");