diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-20 12:05:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-20 12:05:26 -0500 |
| commit | de5e9d58200aafea4a33abcadcd12eb69eaba5c4 (patch) | |
| tree | 6f94c2e558772070d283d25a4ba3d9b1738bb95b /kernel | |
| parent | 55ec86f848a5f872fd43f5d7206464a0af419110 (diff) | |
| parent | 050c6c9b896625d9fa498265be17b82c5fc65257 (diff) | |
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.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: | |||
| 4128 | rq->nr_switches++; | 4128 | rq->nr_switches++; |
| 4129 | rq->curr = next; | 4129 | rq->curr = next; |
| 4130 | ++*switch_count; | 4130 | ++*switch_count; |
| 4131 | WARN_ON_ONCE(test_tsk_need_resched(next)); | ||
| 4132 | 4131 | ||
| 4133 | context_switch(rq, prev, next); /* unlocks the rq */ | 4132 | context_switch(rq, prev, next); /* unlocks the rq */ |
| 4134 | /* | 4133 | /* |