diff --git a/[refs] b/[refs] index fcd6e45344fd..643b9a6888bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97ef6f7449da6ceddf9a90fa8851f607b67283dd +refs/heads/master: e9a5f426b85e429bffaee4e0b086b1e742a39fa6 diff --git a/trunk/kernel/cpu.c b/trunk/kernel/cpu.c index 3097382eb44a..8b92539b4754 100644 --- a/trunk/kernel/cpu.c +++ b/trunk/kernel/cpu.c @@ -394,7 +394,7 @@ static cpumask_var_t frozen_cpus; int disable_nonboot_cpus(void) { - int cpu, first_cpu, error; + int cpu, first_cpu, error = 0; cpu_maps_update_begin(); first_cpu = cpumask_first(cpu_online_mask);