From: Ingo Molnar <mingo@elte.hu>

Teach special (non-nested) unlocking code to the lock validator.  Has no
effect on non-lockdep kernels.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 kernel/posix-timers.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN kernel/posix-timers.c~lock-validator-special-locking-posix-timers kernel/posix-timers.c
--- devel/kernel/posix-timers.c~lock-validator-special-locking-posix-timers	2006-05-29 18:13:32.000000000 -0700
+++ devel-akpm/kernel/posix-timers.c	2006-05-29 18:13:32.000000000 -0700
@@ -576,7 +576,7 @@ static struct k_itimer * lock_timer(time
 	timr = (struct k_itimer *) idr_find(&posix_timers_id, (int) timer_id);
 	if (timr) {
 		spin_lock(&timr->it_lock);
-		spin_unlock(&idr_lock);
+		spin_unlock_non_nested(&idr_lock);
 
 		if ((timr->it_id != timer_id) || !(timr->it_process) ||
 				timr->it_process->tgid != current->tgid) {
_