---

yaml --- r: 44874 b: refs/heads/master c: ba00840 h: refs/heads/master v: v3
git-mirror · Dec 22, 2006 · aee082c · aee082c
1 parent 7585d96
commit aee082c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;