More left-over fixups from the merge with Alan.

diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index a11390eae3356755584a18cae2c4a945885e88b3..743122df6c1eb7da796fecf3ad99cebb9599edc5 100644 (file)
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -823,13 +823,7 @@ static int __init do_boot_cpu(int apicid)
 
        store_NMI_vector(&nmi_high, &nmi_low);
 
-       CMOS_WRITE(0xa, 0xf);
-       local_flush_tlb();
-       Dprintk("1.\n");
-       *((volatile unsigned short *) TRAMPOLINE_HIGH) = start_eip >> 4;
-       Dprintk("2.\n");
-       *((volatile unsigned short *) TRAMPOLINE_LOW) = start_eip & 0xf;
-       Dprintk("3.\n");
+       smpboot_setup_warm_reset_vector(start_eip);
 
        /*
         * Starting actual IPI sequence...