tg3: Add 5784 ASIC rev to earlier PCIe MPS fix

[net-next-2.6.git] / kernel / cpu.c

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 63e8de13c948bb5ddac3034b5ea4e217e7ed71bc..8b92539b4754274528fdc380d45baf6d481001b1 100644 (file)
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -154,16 +154,13 @@ 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)
 {
-       int err;
-
-       err = cpu_notify(val, v);
-       BUG_ON(err);
+       BUG_ON(cpu_notify(val, v));
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
-
 EXPORT_SYMBOL(register_cpu_notifier);
 
 void __ref unregister_cpu_notifier(struct notifier_block *nb)
@@ -397,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);