Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

de5e9d58 · Linus Torvalds <[email protected]> · 2010-12-20 09:05:26 -08:00

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: Remove debugging check

Merge commit. Changes below are compared with the first parent: 55ec86f8.

Changes

1 files changed · +0 −1

File	Status	Add	Del	Content
kernel/sched.c	modified	+0	−1	View file

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 */
 		/*