From 4cd9fbf409a16097093dd577b33f844c55ba17e9 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 24 Apr 2008 00:59:25 -0700
Subject: [PATCH] --- yaml --- r: 92007 b: refs/heads/master c:
 3d36696024499aef19dbf24a781e91a24fbbe4af h: refs/heads/master i:   92005:
 f350cce7ecdf658025467e364761ea20ae886111   92003:
 b269d76c10d33d7693cdf3a4f4aeb2bbacd8567c   91999:
 c380add0ef57d2f626ab20e65706be02171a8318 v: v3

---
 [refs]                   | 2 +-
 trunk/net/unix/af_unix.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5730fb222f8b..a1984af3403c 100644
--- 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
index 2851d0d15048..63ed69ffad99 100644
--- 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");