This commit was manufactured by cvs2svn to create branch

[linux-2.6.git] / arch / i386 / kernel / reboot.c

diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c
index 0697425..e8d5cd3 100644 (file)
--- a/arch/i386/kernel/reboot.c
+++ b/arch/i386/kernel/reboot.c
@@ -233,12 +233,11 @@ void machine_real_restart(unsigned char *code, int length)
        CMOS_WRITE(0x00, 0x8f);
        spin_unlock_irqrestore(&rtc_lock, flags);
 
-       /* Remap the kernel at virtual address zero, as well as offset zero
-          from the kernel segment.  This assumes the kernel segment starts at
-          virtual address PAGE_OFFSET. */
-
-       memcpy (swapper_pg_dir, swapper_pg_dir + USER_PGD_PTRS,
-               sizeof (swapper_pg_dir [0]) * KERNEL_PGD_PTRS);
+       /*
+        * Remap the first 16 MB of RAM (which includes the kernel image)
+        * at virtual address zero:
+        */
+       setup_identity_mappings(swapper_pg_dir, 0, LOW_MAPPINGS_SIZE);
 
        /*
         * Use `swapper_pg_dir' as our page directory.
@@ -330,7 +329,8 @@ void machine_restart(char * __unused)
         * Stop all CPUs and turn off local APICs and the IO-APIC, so
         * other OSs see a clean IRQ state.
         */
-       smp_send_stop();
+       if (!netdump_mode)
+               smp_send_stop();
 #elif defined(CONFIG_X86_LOCAL_APIC)
        if (cpu_has_apic) {
                local_irq_disable();