This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/i386/kernel/machine_kexec.c b/arch/i386/kernel/machine_kexec.c
index ff59e77..3a9e878 100644 (file)
--- a/arch/i386/kernel/machine_kexec.c
+++ b/arch/i386/kernel/machine_kexec.c
@@ -16,7 +16,6 @@
 #include <asm/io.h>
 #include <asm/apic.h>
 #include <asm/cpufeature.h>
-#include <asm/crash_dump.h>
 
 static inline unsigned long read_cr3(void)
 {
@@ -161,30 +160,6 @@ void machine_kexec_cleanup(struct kimage *image)
 {
 }
 
-/*
- * We are going to do a memory preserving reboot. So, we copy over the
- * first 640k of memory into a backup location. Though the second kernel
- * boots from a different location, it still requires the first 640k.
- * Hence this backup.
- */
-void __crash_relocate_mem(unsigned long backup_addr, unsigned long backup_size)
-{
-       unsigned long pfn, pfn_max;
-       void *src_addr, *dest_addr;
-       struct page *page;
-
-       pfn_max = backup_size >> PAGE_SHIFT;
-       for (pfn = 0; pfn < pfn_max; pfn++) {
-               src_addr = phys_to_virt(pfn << PAGE_SHIFT);
-               dest_addr = backup_addr + src_addr;
-               if (!pfn_valid(pfn))
-                       continue;
-               page = pfn_to_page(pfn);
-               if (PageReserved(page))
-                       copy_page(dest_addr, src_addr);
-       }
-}
-
 /*
  * Do not allocate memory (or fail in any way) in machine_kexec().
  * We are past the point of no return, committed to rebooting now.