Merge branch 'for-2.6.33' into for-2.6.34

1 files changed, 4 insertions, 1 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index c535cc4f642..4508fe7048b 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -5530,8 +5530,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())