From aee082c0b08865b5ac403e6d417be785967cc95d Mon Sep 17 00:00:00 2001
From: Mark Fasheh <mark.fasheh@oracle.com>
Date: Fri, 22 Dec 2006 01:06:15 -0800
Subject: [PATCH] --- yaml --- r: 44874 b: refs/heads/master c:
 ba0084048ab785c2cb1d6cc2cccabe642a5b799a h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2c12f40e3c4c..36ff481e8d39 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2aea4fb61609ba7ef82f7dc6fca116bda88816e1
+refs/heads/master: ba0084048ab785c2cb1d6cc2cccabe642a5b799a
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index b81ed8703f70..850bde4b31a2 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -4619,8 +4619,10 @@ asmlinkage long sys_sched_yield(void)
 
 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;