From: Zilvinas Valinskas <zilvinas@wilibox.com>
Date: Fri, 16 Mar 2007 21:38:34 +0000 (-0800)
Subject: initialise pi_lock if CONFIG_RT_MUTEXES=N
X-Git-Tag: v2.6.20.4~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e84657dbb433207cac7edfa45f755c8312fb15b;p=thirdparty%2Fkernel%2Fstable.git

initialise pi_lock if CONFIG_RT_MUTEXES=N

Fixes a bogus lockdep warning which causes lockdep to disable itself.

Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/kernel/fork.c b/kernel/fork.c
index d57118da73ff0..cc374fbfe309d 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -933,8 +933,8 @@ asmlinkage long sys_set_tid_address(int __user *tidptr)
 
 static inline void rt_mutex_init_task(struct task_struct *p)
 {
-#ifdef CONFIG_RT_MUTEXES
 	spin_lock_init(&p->pi_lock);
+#ifdef CONFIG_RT_MUTEXES
 	plist_head_init(&p->pi_waiters, &p->pi_lock);
 	p->pi_blocked_on = NULL;
 #endif