X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=kernel%2Fsched.c;h=ec3bd1f398b34ea37ca6f5e75152c42d99723b8b;hb=7317d7b87edb41a9135e30be1ec3f7ef817c53dd;hp=98890807375b87df9f134f3fdd7505153547e678;hpb=6918bc5c830e890681eabb3c6cb6b8d117a52d14;p=safe%2Fjmp%2Flinux-2.6

diff --git a/kernel/sched.c b/kernel/sched.c
index 9889080..ec3bd1f 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4305,7 +4305,7 @@ void __kprobes sub_preempt_count(int val)
 	/*
 	 * Underflow?
 	 */
-	if (DEBUG_LOCKS_WARN_ON(val > preempt_count()))
+       if (DEBUG_LOCKS_WARN_ON(val > preempt_count() - (!!kernel_locked())))
 		return;
 	/*
 	 * Is the spinlock portion underflowing?