From 43de4c010d58b66b84449b9ae07381d347311398 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 23 Feb 2008 15:23:55 -0800
Subject: [PATCH] --- yaml --- r: 86231 b: refs/heads/master c:
 3e4ab747efa8e78562ec6782b08bbf21a00aba1b h: refs/heads/master i:   86229:
 72f50a15bc1c80c17347b2a97fddecb4cb02af2f   86227:
 a5a47aa304600be52f7ec7b2d43616a40b7d3fec   86223:
 e06300151fc39ef1bc602b333fc8288efd288bca v: v3

---
 [refs]               |  2 +-
 trunk/kernel/futex.c | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 541fe2e4985a..6834ebd955f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43fe105a5c91b2f00ea7f900ed307fe980410612
+refs/heads/master: 3e4ab747efa8e78562ec6782b08bbf21a00aba1b
diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c
index 221f2128a437..c21f667c63f6 100644
--- a/trunk/kernel/futex.c
+++ b/trunk/kernel/futex.c
@@ -2145,8 +2145,14 @@ static struct file_system_type futex_fs_type = {
 
 static int __init init(void)
 {
-	int i = register_filesystem(&futex_fs_type);
+	int i;
 
+	for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
+		plist_head_init(&futex_queues[i].chain, &futex_queues[i].lock);
+		spin_lock_init(&futex_queues[i].lock);
+	}
+
+	i = register_filesystem(&futex_fs_type);
 	if (i)
 		return i;
 
@@ -2156,10 +2162,6 @@ static int __init init(void)
 		return PTR_ERR(futex_mnt);
 	}
 
-	for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
-		plist_head_init(&futex_queues[i].chain, &futex_queues[i].lock);
-		spin_lock_init(&futex_queues[i].lock);
-	}
 	return 0;
 }
 __initcall(init);