linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / kernel / power / smp.c

diff --git a/kernel/power/smp.c b/kernel/power/smp.c
index 5957312..911fc62 100644 (file)
--- a/kernel/power/smp.c
+++ b/kernel/power/smp.c
@@ -49,7 +49,9 @@ void enable_nonboot_cpus(void)
 
        printk("Thawing cpus ...\n");
        for_each_cpu_mask(cpu, frozen_cpus) {
-               error = cpu_up(cpu);
+               error = smp_prepare_cpu(cpu);
+               if (!error)
+                       error = cpu_up(cpu);
                if (!error) {
                        printk("CPU%d is up\n", cpu);
                        continue;