diff --git a/[refs] b/[refs]
index 28ca21c98fc9..5e2dab72f1cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6918bc5c830e890681eabb3c6cb6b8d117a52d14
+refs/heads/master: 7317d7b87edb41a9135e30be1ec3f7ef817c53dd
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 98890807375b..ec3bd1f398b3 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/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?