Commit-ID: def4f719bb925d4608c6d19d706c528b1fe15548
Gitweb: http://git.kernel.org/tip/def4f719bb925d4608c6d19d706c528b1fe15548
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Thu, 5 May 2016 16:21:38 +0200
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Thu, 5 May 2016 16:25:12 +0200
sched/hotplug: Hide sched_cpu_dying implementations for CPU_HOTPLUG=n
commit 9c793cb19c6a made the previously conditional code unconditional and
introduced a compile error on CPU_HOTPLUG=n. It's unclear whether we need at
least some of the functionality in the long run even when CPU_HOTPLUG is off,
but for now we just restore the previous state.
Reported-by: Ingo Molnar <mingo@xxxxxxxxxx>
Reported-by: Fenguang Wu <fengguang.wu@xxxxxxxxx>
Fixes: 9c793cb19c6a 'sched/hotplug: Move migration CPU_DYING to sched_cpu_dying()'
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
---
kernel/sched/core.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 2500ac1..adb6aa7 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -7084,6 +7084,7 @@ int sched_cpu_starting(unsigned int cpu)
int sched_cpu_dying(unsigned int cpu)
{
+#ifdef CONFIG_HOTPLUG_CPU
struct rq *rq = cpu_rq(cpu);
unsigned long flags;
@@ -7101,6 +7102,7 @@ int sched_cpu_dying(unsigned int cpu)
update_max_interval();
nohz_balance_exit_idle(cpu);
hrtick_clear(rq);
+#endif
return 0;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|