Merge branch 'perf/urgent' into perf/core
[linux-2.6.git] / kernel / sched.c
index c3ad342..7266b91 100644 (file)
@@ -5536,8 +5536,11 @@ need_resched_nonpreemptible:
 
        post_schedule(rq);
 
-       if (unlikely(reacquire_kernel_lock(current) < 0))
+       if (unlikely(reacquire_kernel_lock(current) < 0)) {
+               prev = rq->curr;
+               switch_count = &prev->nivcsw;
                goto need_resched_nonpreemptible;
+       }
 
        preempt_enable_no_resched();
        if (need_resched())