From 8c999d074cdf880143b0baa3d7573e1ff31951cf Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Thu, 16 Jul 2009 15:44:29 +0200 Subject: [PATCH] --- yaml --- r: 158322 b: refs/heads/master c: e7aaaa6934636d7a6cadd9e2a05250fbb6a34f65 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 1f850c651cd0..4156634f1610 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5304d5fc74a269cc6c3e70f9713684ca729abdf0 +refs/heads/master: e7aaaa6934636d7a6cadd9e2a05250fbb6a34f65 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 03f7e3fd80b5..4c5ee843d57f 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -6618,11 +6618,9 @@ static void __cond_resched(void) * PREEMPT_ACTIVE, which could trigger a second * cond_resched() call. */ - do { - add_preempt_count(PREEMPT_ACTIVE); - schedule(); - sub_preempt_count(PREEMPT_ACTIVE); - } while (need_resched()); + add_preempt_count(PREEMPT_ACTIVE); + schedule(); + sub_preempt_count(PREEMPT_ACTIVE); } int __sched _cond_resched(void)