diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-09-16 14:04:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-09-16 14:05:04 +0200 |
| commit | 563c4f85f9f0d63b712081d5b4522152cdcb8b6b (patch) | |
| tree | 92351ab2d60d5fd7ce5745d21c9a60ce6d46c5dd /kernel/sched/sched.h | |
| parent | 4adcdcea717cb2d8436bef00dd689aa5bc76f11b (diff) | |
| parent | 09c7e8b21d67c3c78ab9701dbc0fb1e9f14a0ba5 (diff) | |
Merge branch 'sched/rt' into sched/core, to pick up -rt changes
Pick up the first couple of patches working towards PREEMPT_RT.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/sched.h')
| -rw-r--r-- | kernel/sched/sched.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 00ff5b57e9cd..b3cb895d14a2 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1958,7 +1958,7 @@ unsigned long arch_scale_freq_capacity(int cpu) #endif #ifdef CONFIG_SMP -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION static inline void double_rq_lock(struct rq *rq1, struct rq *rq2); @@ -2010,7 +2010,7 @@ static inline int _double_lock_balance(struct rq *this_rq, struct rq *busiest) return ret; } -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ /* * double_lock_balance - lock the busiest runqueue, this_rq is locked already. |