From: Zilvinas Valinskas <zilvinas@wilibox.com>
Date: Fri, 16 Mar 2007 21:38:34 +0000 (-0800)
Subject: [PATCH] initialise pi_lock if CONFIG_RT_MUTEXES=N
X-Git-Tag: v2.6.21-rc5~79
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e29e175b0f40cffc86068156733def14a7a533ab;p=linux-2.6-omap-h63xx.git

[PATCH] 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>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/kernel/fork.c b/kernel/fork.c
index d154cc78648..6af959c034d 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