Merge branch 'linus' into sched/core
[linux-2.6.git] / include / linux / sched.h
index 14a6c7b..341a4d7 100644 (file)
@@ -2510,7 +2510,7 @@ extern int _cond_resched(void);
 
 extern int __cond_resched_lock(spinlock_t *lock);
 
-#ifdef CONFIG_PREEMPT
+#ifdef CONFIG_PREEMPT_COUNT
 #define PREEMPT_LOCK_OFFSET    PREEMPT_OFFSET
 #else
 #define PREEMPT_LOCK_OFFSET    0