---

yaml --- r: 179729 b: refs/heads/master c: 6d558c3 h: refs/heads/master i: 179727: f84b1d8 v: v3
git-mirror · Jan 21, 2010 · e859d47 · e859d47
1 parent acd3dda
commit e859d47
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50b926e439620c469565e8be0f28be78f5fca1ce
+refs/heads/master: 6d558c3ac9b6508d26fd5cadccce51fc9d726b1c
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -5530,8 +5530,11 @@ asmlinkage void __sched schedule(void)
 
 	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())