From 922fed628c625b28a50f66267e4b9f99088e2aa4 Mon Sep 17 00:00:00 2001 From: Olav Haugan Date: Sun, 3 Jul 2016 15:02:08 -0700 Subject: timer: Do not require CPUSETS to be enabled for migration Do not require CPUSETS to be enabled to allow migration of timers and hrtimers. Change-Id: Ib911a0d34c250c4df020bdb265b92d2b8df8db93 Signed-off-by: Olav Haugan --- kernel/time/hrtimer.c | 10 +++------- kernel/time/timer.c | 2 -- 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'kernel') diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index f3b89de9ca2a..1b0117198a08 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -1624,7 +1624,7 @@ static void init_hrtimers_cpu(int cpu) hrtimer_init_hres(cpu_base); } -#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_CPUSETS) +#if defined(CONFIG_HOTPLUG_CPU) static void migrate_hrtimer_list(struct hrtimer_clock_base *old_base, struct hrtimer_clock_base *new_base, bool remove_pinned) @@ -1703,9 +1703,7 @@ static void __migrate_hrtimers(int scpu, bool remove_pinned) __hrtimer_peek_ahead_timers(); local_irq_restore(flags); } -#endif /* CONFIG_HOTPLUG_CPU || CONFIG_CPUSETS */ -#ifdef CONFIG_HOTPLUG_CPU static void migrate_hrtimers(int scpu) { BUG_ON(cpu_online(scpu)); @@ -1714,14 +1712,12 @@ static void migrate_hrtimers(int scpu) __migrate_hrtimers(scpu, true); } -#endif /* CONFIG_HOTPLUG_CPU */ - -#ifdef CONFIG_CPUSETS void hrtimer_quiesce_cpu(void *cpup) { __migrate_hrtimers(*(int *)cpup, false); } -#endif /* CONFIG_CPUSETS */ + +#endif /* CONFIG_HOTPLUG_CPU */ static int hrtimer_cpu_notify(struct notifier_block *self, unsigned long action, void *hcpu) diff --git a/kernel/time/timer.c b/kernel/time/timer.c index d38a67a49550..0efb3916f5a4 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1695,12 +1695,10 @@ static void migrate_timers(int cpu) __migrate_timers(cpu, false, true); } -#ifdef CONFIG_CPUSETS void timer_quiesce_cpu(void *cpup) { __migrate_timers(*(int *)cpup, true, false); } -#endif /* CONFIG_CPUSETS */ static int timer_cpu_notify(struct notifier_block *self, unsigned long action, void *hcpu) -- cgit v1.2.3