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/fair.c | |
| parent | eb60b3e5e8dfdd590e586a6fc22daf2f63a7b7e6 (diff) | |
| parent | e5ef27d0f5acf9f1db2882d7546a41c021f66820 (diff) | |
| download | linux-4eb867651721228ee2eeae142c53378375303e8b.tar.bz2 | |
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/fair.c')
| -rw-r--r-- | kernel/sched/fair.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 39fde3660f97..84e465ae7c63 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7814,7 +7814,7 @@ static void nohz_balancer_kick(void) return; } -static inline void nohz_balance_exit_idle(int cpu) +void nohz_balance_exit_idle(unsigned int cpu) { if (unlikely(test_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu)))) { /* @@ -7887,18 +7887,6 @@ void nohz_balance_enter_idle(int cpu) atomic_inc(&nohz.nr_cpus); set_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu)); } - -static int sched_ilb_notifier(struct notifier_block *nfb, - unsigned long action, void *hcpu) -{ - switch (action & ~CPU_TASKS_FROZEN) { - case CPU_DYING: - nohz_balance_exit_idle(smp_processor_id()); - return NOTIFY_OK; - default: - return NOTIFY_DONE; - } -} #endif static DEFINE_SPINLOCK(balancing); @@ -8704,7 +8692,6 @@ __init void init_sched_fair_class(void) #ifdef CONFIG_NO_HZ_COMMON nohz.next_balance = jiffies; zalloc_cpumask_var(&nohz.idle_cpus_mask, GFP_NOWAIT); - cpu_notifier(sched_ilb_notifier, 0); #endif #endif /* SMP */ |