diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-12-20 13:48:11 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-12-20 13:48:11 +0800 |
| commit | 35194db1b78973c1b3251f5c7bea2c1bafec6a08 (patch) | |
| tree | 72a5b3da5a1f43f269a00c4b7ea96d400a1b4441 /kernel/cpu.c | |
| parent | 2f0de5192ae332ff270b2fc30594e4d67002d59b (diff) | |
| parent | 6381499f5898ef4144b1522cf35caab69d4d95eb (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 | 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 |