diff options
| author | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2008-05-02 20:52:04 -0400 |
|---|---|---|
| committer | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2008-05-02 20:52:04 -0400 |
| commit | d8be518053ec5b66250836f6989d1dffca5b021c (patch) | |
| tree | 8e3a2cbec6346877eb672337d89e8c7d3da96470 /kernel | |
| parent | 9ba6aa51b390e7f1ec301bbf2f064aa9937f6e7f (diff) | |
| parent | a1f204ec33f806c6db8a4bfe6cc1a1e6109e8ef8 (diff) | |
Merge commit 'jupiter/debug' into debug
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 7268034c88..c52f1b3000 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -3649,9 +3649,10 @@ need_resched_nonpreemptible: | |||
| 3649 | /* do litmus scheduling outside of rq lock, so that we | 3649 | /* do litmus scheduling outside of rq lock, so that we |
| 3650 | * can do proper migrations for global schedulers | 3650 | * can do proper migrations for global schedulers |
| 3651 | */ | 3651 | */ |
| 3652 | litmus_schedule(rq, prev); | 3652 | |
| 3653 | spin_lock(&rq->lock); | 3653 | spin_lock(&rq->lock); |
| 3654 | clear_tsk_need_resched(prev); | 3654 | clear_tsk_need_resched(prev); |
| 3655 | litmus_schedule(rq, prev); | ||
| 3655 | 3656 | ||
| 3656 | if (prev->state && !(preempt_count() & PREEMPT_ACTIVE)) { | 3657 | if (prev->state && !(preempt_count() & PREEMPT_ACTIVE)) { |
| 3657 | if (unlikely((prev->state & TASK_INTERRUPTIBLE) && | 3658 | if (unlikely((prev->state & TASK_INTERRUPTIBLE) && |