Merge branch 'linus' into sched/urgent

[linux-2.6-omap-h63xx.git] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index 6f230596bd0c1d21a2c68ffbff8207e93dcd65b5..c530b84c7f80de1225cb8d244a220adf3b817af5 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4441,12 +4441,8 @@ need_resched_nonpreemptible:
        if (sched_feat(HRTICK))
                hrtick_clear(rq);
 
-       /*
-        * Do the rq-clock update outside the rq lock:
-        */
-       local_irq_disable();
+       spin_lock_irq(&rq->lock);
        update_rq_clock(rq);
-       spin_lock(&rq->lock);
        clear_tsk_need_resched(prev);
 
        if (prev->state && !(preempt_count() & PREEMPT_ACTIVE)) {