diff options
| author | Santosh Shukla <santosh.shukla@linaro.org> | 2015-03-25 16:09:32 +0530 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-07-22 16:17:10 -0500 |
| commit | 45d6a1fb3d57016bed8fbd549332f24a31cc06b8 (patch) | |
| tree | 9cb9f7bc22891c56f7bfb3bfe165ef9a1948e0d5 | |
| parent | ec00161d4f2e22fa1587ed85d898be3caddf773f (diff) | |
no-hz_full: build fix
Signed-off-by: Santosh Shukla <santosh.shukla@linaro.org>
| -rw-r--r-- | kernel/cpuset.c | 4 | ||||
| -rw-r--r-- | kernel/time/timer.c | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 7a83c9a69939..e1571cbe7982 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -1288,8 +1288,8 @@ static int quiesce_cpuset(struct cpuset *cs, int turning_on) for_each_cpu(from_cpu, cs->cpus_allowed) { smp_call_function_any(&cpumask, hrtimer_quiesce_cpu, &from_cpu, 1); - smp_call_function_any(&cpumask, timer_quiesce_cpu, &from_cpu, - 1); + smp_call_function_any(&cpumask, timer_quiesce_cpu, &from_cpu, + 1); } return 0; diff --git a/kernel/time/timer.c b/kernel/time/timer.c index faa999557fe4..2da2fbad26e5 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1754,6 +1754,13 @@ static void migrate_timers(int cpu) } #endif /* CONFIG_HOTPLUG_CPU */ +#ifdef CONFIG_CPUSETS +void timer_quiesce_cpu(void *cpup) +{ + __migrate_timers(*(int *)cpup, false); +} +#endif /* CONFIG_CPUSETS */ + static int timer_cpu_notify(struct notifier_block *self, unsigned long action, void *hcpu) { |