diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-05-12 09:51:36 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-05-12 09:51:36 +0200 |
commit | 4eb867651721228ee2eeae142c53378375303e8b (patch) | |
tree | 43ebd9894ff53a7b2d0244293f226cbbfc80d882 /kernel/sched/sched.h | |
parent | eb60b3e5e8dfdd590e586a6fc22daf2f63a7b7e6 (diff) | |
parent | e5ef27d0f5acf9f1db2882d7546a41c021f66820 (diff) | |
download | op-kernel-dev-4eb867651721228ee2eeae142c53378375303e8b.zip op-kernel-dev-4eb867651721228ee2eeae142c53378375303e8b.tar.gz |
Merge branch 'smp/hotplug' into sched/core, to resolve conflicts
Conflicts:
kernel/sched/core.c
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, 4 insertions, 0 deletions
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index d24e91b..ab6adb1 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1700,6 +1700,10 @@ enum rq_nohz_flag_bits { }; #define nohz_flags(cpu) (&cpu_rq(cpu)->nohz_flags) + +extern void nohz_balance_exit_idle(unsigned int cpu); +#else +static inline void nohz_balance_exit_idle(unsigned int cpu) { } #endif #ifdef CONFIG_IRQ_TIME_ACCOUNTING |