diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-03 11:10:55 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-03 11:10:55 -0800 |
| commit | 9b133b6207826ae8cbe5f7de0b407253191e98fa (patch) | |
| tree | 250eaae3c221ef7db71b3b18ccc1935ad273ec2b /kernel/cpu.c | |
| parent | b82fdb62ee3caa1d07f47930cf54f1996fa50fd2 (diff) | |
| parent | a34f0e8a2f8976f0bae4962edf2af4dd16cb85f7 (diff) | |
Merge tag 'v4.4.39' into android-4.4.y
This is the 4.4.39 stable release
Change-Id: I36dd900bb57846dbbcd7b274774f1debef0f1f18
Diffstat (limited to 'kernel/cpu.c')
| -rw-r--r-- | kernel/cpu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index c8a1751be224..a2dd1d7af74f 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -232,8 +232,6 @@ static int cpu_notify(unsigned long val, void *v) return __cpu_notify(val, v, -1, NULL); } -#ifdef CONFIG_HOTPLUG_CPU - static void cpu_notify_nofail(unsigned long val, void *v) { BUG_ON(cpu_notify(val, v)); @@ -255,6 +253,7 @@ void __unregister_cpu_notifier(struct notifier_block *nb) } EXPORT_SYMBOL(__unregister_cpu_notifier); +#ifdef CONFIG_HOTPLUG_CPU /** * clear_tasks_mm_cpumask - Safely clear tasks' mm_cpumask for a CPU * @cpu: a CPU id |