diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-05-13 11:32:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-05-13 11:32:58 +0200 |
| commit | 1dbd6608191cff854ab467e9880b7aeb2385ca39 (patch) | |
| tree | e6f3d157e6f6ced99df9b12ea17186dca35d3624 /include/linux | |
| parent | 5aaca7a7a5db157530d195c4b93c8fc4682f8a48 (diff) | |
| parent | c714a534d85576af21b06be605ca55cb2fb887ee (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sched.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 5a63f2d72af6..5395a6176f4b 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2038,7 +2038,7 @@ static inline int need_resched(void) * cond_resched_softirq() will enable bhs before scheduling. */ extern int _cond_resched(void); -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPT_BKL static inline int cond_resched(void) { return 0; |