diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-20 09:05:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-20 09:05:26 -0800 |
| commit | de5e9d58200aafea4a33abcadcd12eb69eaba5c4 (patch) | |
| tree | 6f94c2e558772070d283d25a4ba3d9b1738bb95b | |
| parent | Merge branches 'x86-fixes-for-linus' and 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | sched: Remove debugging check (diff) | |
| download | linux-dev-de5e9d58200aafea4a33abcadcd12eb69eaba5c4.tar.xz linux-dev-de5e9d58200aafea4a33abcadcd12eb69eaba5c4.zip | |
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
| -rw-r--r-- | kernel/sched.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 456c99054160..297d1a0eedb0 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 */ /* |