diff options
Diffstat (limited to 'kernel/cpu.c')
-rw-r--r-- | kernel/cpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index 3097382eb44a..97d1b426a4ac 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c | |||
@@ -34,7 +34,7 @@ void cpu_maps_update_done(void) | |||
34 | mutex_unlock(&cpu_add_remove_lock); | 34 | mutex_unlock(&cpu_add_remove_lock); |
35 | } | 35 | } |
36 | 36 | ||
37 | static __cpuinitdata RAW_NOTIFIER_HEAD(cpu_chain); | 37 | static RAW_NOTIFIER_HEAD(cpu_chain); |
38 | 38 | ||
39 | /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. | 39 | /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. |
40 | * Should always be manipulated under cpu_add_remove_lock | 40 | * Should always be manipulated under cpu_add_remove_lock |
@@ -394,7 +394,7 @@ static cpumask_var_t frozen_cpus; | |||
394 | 394 | ||
395 | int disable_nonboot_cpus(void) | 395 | int disable_nonboot_cpus(void) |
396 | { | 396 | { |
397 | int cpu, first_cpu, error; | 397 | int cpu, first_cpu, error = 0; |
398 | 398 | ||
399 | cpu_maps_update_begin(); | 399 | cpu_maps_update_begin(); |
400 | first_cpu = cpumask_first(cpu_online_mask); | 400 | first_cpu = cpumask_first(cpu_online_mask); |