From 8fe5388c37f01e499eb00fd4389ffdc0ab6f81a9 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 29 Dec 2006 16:48:13 -0800
Subject: [PATCH] --- yaml --- r: 45113 b: refs/heads/master c:
 9414232fa0cc28e2f51b8c76d260f2748f7953fc h: refs/heads/master i:   45111:
 cea814a2149bb811b32873ce8c6663b6d5acc233 v: v3

---
 [refs]               |  2 +-
 trunk/kernel/sched.c | 18 ++++--------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index e2b37b514472..f746e5819a6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d449db98d5d7d90f29f9f6e091b0e1d996184df1
+refs/heads/master: 9414232fa0cc28e2f51b8c76d260f2748f7953fc
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index b515e3caad7f..3df33da0dafc 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -4617,17 +4617,6 @@ asmlinkage long sys_sched_yield(void)
 	return 0;
 }
 
-static inline int __resched_legal(int expected_preempt_count)
-{
-#ifdef CONFIG_PREEMPT
-	if (unlikely(preempt_count() != expected_preempt_count))
-		return 0;
-#endif
-	if (unlikely(system_state != SYSTEM_RUNNING))
-		return 0;
-	return 1;
-}
-
 static void __cond_resched(void)
 {
 #ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
@@ -4647,7 +4636,8 @@ static void __cond_resched(void)
 
 int __sched cond_resched(void)
 {
-	if (need_resched() && __resched_legal(0)) {
+	if (need_resched() && !(preempt_count() & PREEMPT_ACTIVE) &&
+					system_state == SYSTEM_RUNNING) {
 		__cond_resched();
 		return 1;
 	}
@@ -4673,7 +4663,7 @@ int cond_resched_lock(spinlock_t *lock)
 		ret = 1;
 		spin_lock(lock);
 	}
-	if (need_resched() && __resched_legal(1)) {
+	if (need_resched() && system_state == SYSTEM_RUNNING) {
 		spin_release(&lock->dep_map, 1, _THIS_IP_);
 		_raw_spin_unlock(lock);
 		preempt_enable_no_resched();
@@ -4689,7 +4679,7 @@ int __sched cond_resched_softirq(void)
 {
 	BUG_ON(!in_softirq());
 
-	if (need_resched() && __resched_legal(0)) {
+	if (need_resched() && system_state == SYSTEM_RUNNING) {
 		raw_local_irq_disable();
 		_local_bh_enable();
 		raw_local_irq_enable();