diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-13 12:01:52 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-13 12:01:52 +0800 |
| commit | e30546378ec2c5cc1a5ef97695d8ba859b0abd23 (patch) | |
| tree | 0a3c9d9ac448694a039a63db6549cfaebdaea07f /kernel/cpu.c | |
| parent | 7785301d9209cf083369c6f088cd1d48ec417863 (diff) | |
| parent | 99d4c5fe0b7838de15c59b375491ef075848d92d (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'kernel/cpu.c')
| -rw-r--r-- | kernel/cpu.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index a2dd1d7af74f..24ca2963754b 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -232,10 +232,6 @@ static int cpu_notify(unsigned long val, void *v) return __cpu_notify(val, v, -1, NULL); } -static void cpu_notify_nofail(unsigned long val, void *v) -{ - BUG_ON(cpu_notify(val, v)); -} EXPORT_SYMBOL(register_cpu_notifier); EXPORT_SYMBOL(__register_cpu_notifier); @@ -254,6 +250,11 @@ void __unregister_cpu_notifier(struct notifier_block *nb) EXPORT_SYMBOL(__unregister_cpu_notifier); #ifdef CONFIG_HOTPLUG_CPU +static void cpu_notify_nofail(unsigned long val, void *v) +{ + BUG_ON(cpu_notify(val, v)); +} + /** * clear_tasks_mm_cpumask - Safely clear tasks' mm_cpumask for a CPU * @cpu: a CPU id |