diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-07-01 13:20:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-01 13:20:51 +0200 |
| commit | 1ecc818c51b1f6886825dae3885792d5e49ec798 (patch) | |
| tree | 2179ae53fa86ea6a42d01ff4efc1a3f6a32e76f2 /include/linux/sched.h | |
| parent | 1c09ab0d257317f97e8629a3d0c8713d6dd9de4c (diff) | |
| parent | d902db1eb60387040fe541573083e47469db50ac (diff) | |
Merge branch 'sched/core-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into sched/core
Diffstat (limited to 'include/linux/sched.h')
| -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 a837b20ba19..9a9beef3c0f 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2501,7 +2501,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 |