Merge to Fedora Core 2 kernel-2.6.8-1.521

[linux-2.6.git] / arch / x86_64 / kernel / smpboot.c

diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c
index 0693740..29f2578 100644 (file)
--- a/arch/x86_64/kernel/smpboot.c
+++ b/arch/x86_64/kernel/smpboot.c
@@ -659,7 +659,7 @@ static void __init do_boot_cpu (int apicid)
                        Dprintk("CPU has booted.\n");
                } else {
                        boot_error = 1;
-                       if (*((volatile unsigned char *)phys_to_virt(8192))
+                       if (*((volatile unsigned char *)phys_to_virt(SMP_TRAMPOLINE_BASE))
                                        == 0xA5)
                                /* trampoline started but...? */
                                printk("Stuck ??\n");
@@ -676,9 +676,6 @@ static void __init do_boot_cpu (int apicid)
                clear_bit(cpu, &cpu_initialized); /* was set by cpu_init() */
                cpucount--;
        }
-
-       /* mark "stuck" area as not stuck */
-       *((volatile unsigned *)phys_to_virt(8192)) = 0;
 }
 
 cycles_t cacheflush_time;