diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-17 12:44:14 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-17 12:44:14 -0800 |
| commit | f103e3b0d8e462a747c53fc5a7ac3981ef1e8f3f (patch) | |
| tree | 2fcb1d356e096ae0b0c047abebfaa0424223595e /kernel/cpu.c | |
| parent | 82a6fedb6ea53c9f3eb00ab1e0b839d3fcfe5fc2 (diff) | |
| parent | d9ea51a9bea4ed29f8fd9c59a8122c7aabcc5562 (diff) | |
Merge tag 'v4.4.43' into android-4.4.y
This is the 4.4.43 stable release
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 |