summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-12 13:00:50 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-12 13:00:50 +0100
commit01e3eb82278bf45221fc38b391bc5ee0f6a314d6 (patch)
treef360e00729c85091798cbc99e5ea10cdf0c7e3a8 /kernel
parentfd2ab30b65e961b974ae0bc71e0d47d6b35e0968 (diff)
downloadop-kernel-dev-01e3eb82278bf45221fc38b391bc5ee0f6a314d6.zip
op-kernel-dev-01e3eb82278bf45221fc38b391bc5ee0f6a314d6.tar.gz
Revert "sched: improve preempt debugging"
This reverts commit 7317d7b87edb41a9135e30be1ec3f7ef817c53dd. This has been reported (and bisected) by Alexey Zaytsev and Kamalesh Babulal to produce annoying warnings during bootup on both x86 and powerpc. kernel_locked() is not a valid test in IRQ context (we update the BKL's ->lock_depth and the preempt count separately and non-atomicalyy), so we cannot put it into the generic preempt debugging checks which can run in IRQ contexts too. Reported-and-bisected-by: Alexey Zaytsev <alexey.zaytsev@gmail.com> Reported-and-bisected-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 8be2c13..3b630d8 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4440,7 +4440,7 @@ void __kprobes sub_preempt_count(int val)
/*
* Underflow?
*/
- if (DEBUG_LOCKS_WARN_ON(val > preempt_count() - (!!kernel_locked())))
+ if (DEBUG_LOCKS_WARN_ON(val > preempt_count()))
return;
/*
* Is the spinlock portion underflowing?
OpenPOWER on IntegriCloud