Skip to content

Commit

Permalink
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
torvalds committed Dec 20, 2010
2 parents 55ec86f + 050c6c9 commit de5e9d5
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion kernel/sched.c
Expand Up @@ -4128,7 +4128,6 @@ asmlinkage void __sched schedule(void)
rq->nr_switches++;
rq->curr = next;
++*switch_count;
WARN_ON_ONCE(test_tsk_need_resched(next));

context_switch(rq, prev, next); /* unlocks the rq */
/*
Expand Down

0 comments on commit de5e9d5

Please sign in to comment.