Merge master.kernel.org:/home/rmk/linux-2.6-serial

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

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