Merge commit 'v2.6.28-rc2' into core/locking

[linux-2.6-omap-h63xx.git] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index 6625c3c4b10d06c3f76c371becd615d174244902..0a4dc3b1300b07d7284f626a3c572f186d8c257c 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4327,7 +4327,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?