summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-20 09:05:26 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-20 09:05:26 -0800
commitde5e9d58200aafea4a33abcadcd12eb69eaba5c4 (patch)
tree6f94c2e558772070d283d25a4ba3d9b1738bb95b /kernel
parent55ec86f848a5f872fd43f5d7206464a0af419110 (diff)
parent050c6c9b896625d9fa498265be17b82c5fc65257 (diff)
downloadop-kernel-dev-de5e9d58200aafea4a33abcadcd12eb69eaba5c4.zip
op-kernel-dev-de5e9d58200aafea4a33abcadcd12eb69eaba5c4.tar.gz
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Remove debugging check
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 456c990..297d1a0 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4128,7 +4128,6 @@ need_resched_nonpreemptible:
rq->nr_switches++;
rq->curr = next;
++*switch_count;
- WARN_ON_ONCE(test_tsk_need_resched(next));
context_switch(rq, prev, next); /* unlocks the rq */
/*
OpenPOWER on IntegriCloud