From e859d47ca3dd5f9b05056e9734817978cc1dd2d1 Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Mon, 11 Jan 2010 14:21:25 +0800 Subject: [PATCH] --- yaml --- r: 179729 b: refs/heads/master c: 6d558c3ac9b6508d26fd5cadccce51fc9d726b1c h: refs/heads/master i: 179727: f84b1d8129f38835570353d9091bc0544fb292ee v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index de162cf7a450..c5eb81d35cd7 100644 --- 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 index c535cc4f6428..4508fe7048be 100644 --- 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())