diff options
| author | Santosh Shukla <santosh.shukla@linaro.org> | 2015-03-25 16:09:32 +0530 |
|---|---|---|
| committer | Santosh Shukla <sshukla@mvista.com> | 2015-04-15 09:38:39 +0000 |
| commit | 3633b88d8fcb4273807574c27c328b6908a741e5 (patch) | |
| tree | 2df2d9e503093c4376604942c50ede30d89ed35d | |
| parent | 902e4d4eb0d2158d2792166221a72a829caecf07 (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 | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 7a83c9a6993..e1571cbe798 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 6118b0bab8b..de81f5085da 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1668,7 +1668,7 @@ static void __migrate_timers(int cpu, bool remove_pinned) } spin_unlock(&old_base->lock); - spin_unlock_irqrestore(&new_base->lock, flag); + spin_unlock_irqrestore(&new_base->lock, flags); put_cpu_var(tvec_bases); } #endif /* CONFIG_HOTPLUG_CPU || CONFIG_CPUSETS */ @@ -1681,6 +1681,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) { |