Merge branch 'x86-stage-3-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-stage-3-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (190 commits)
  Revert "cpuacct: reduce one NULL check in fast-path"
  Revert "x86: don't compile vsmp_64 for 32bit"
  x86: Correct behaviour of irq affinity
  x86: early_ioremap_init(), use __fix_to_virt(), because we are sure it's safe
  x86: use default_cpu_mask_to_apicid for 64bit
  x86: fix set_extra_move_desc calling
  x86, PAT, PCI: Change vma prot in pci_mmap to reflect inherited prot
  x86/dmi: fix dmi_alloc() section mismatches
  x86: e820 fix various signedness issues in setup.c and e820.c
  x86: apic/io_apic.c define msi_ir_chip and ir_ioapic_chip all the time
  x86: irq.c keep CONFIG_X86_LOCAL_APIC interrupts together
  x86: irq.c use same path for show_interrupts
  x86: cpu/cpu.h cleanup
  x86: Fix a couple of sparse warnings in arch/x86/kernel/apic/io_apic.c
  Revert "x86: create a non-zero sized bm_pte only when needed"
  x86: pci-nommu.c cleanup
  x86: io_delay.c cleanup
  x86: rtc.c cleanup
  x86: i8253 cleanup
  x86: kdebugfs.c cleanup
  ...

1 files changed, 0 insertions, 44 deletions

diff --git a/arch/x86/boot/pm.c b/arch/x86/boot/pm.c
index 85a1cd8a8ff8..8062f8915250 100644
--- a/arch/x86/boot/pm.c
+++ b/arch/x86/boot/pm.c
@@ -33,47 +33,6 @@ static void realmode_switch_hook(void)
 }
 
 /*
- * A zImage kernel is loaded at 0x10000 but wants to run at 0x1000.
- * A bzImage kernel is loaded and runs at 0x100000.
- */
-static void move_kernel_around(void)
-{
-        /* Note: rely on the compile-time option here rather than
-           the LOADED_HIGH flag.  The Qemu kernel loader unconditionally
-           sets the loadflags to zero. */
-#ifndef __BIG_KERNEL__
-        u16 dst_seg, src_seg;
-        u32 syssize;
-
-        dst_seg =  0x1000 >> 4;
-        src_seg = 0x10000 >> 4;
-        syssize = boot_params.hdr.syssize; /* Size in 16-byte paragraphs */
-
-        while (syssize) {
-                int paras  = (syssize >= 0x1000) ? 0x1000 : syssize;
-                int dwords = paras << 2;
-
-                asm volatile("pushw %%es ; "
-                             "pushw %%ds ; "
-                             "movw %1,%%es ; "
-                             "movw %2,%%ds ; "
-                             "xorw %%di,%%di ; "
-                             "xorw %%si,%%si ; "
-                             "rep;movsl ; "
-                             "popw %%ds ; "
-                             "popw %%es"
-                             : "+c" (dwords)
-                             : "r" (dst_seg), "r" (src_seg)
-                             : "esi", "edi");
-
-                syssize -= paras;
-                dst_seg += paras;
-                src_seg += paras;
-        }
-#endif
-}
-
-/*
  * Disable all interrupts at the legacy PIC.
  */
 static void mask_all_interrupts(void)
@@ -147,9 +106,6 @@ void go_to_protected_mode(void)
         /* Hook before leaving real mode, also disables interrupts */
         realmode_switch_hook();
 
-        /* Move the kernel/setup to their final resting places */
-        move_kernel_around();
-
         /* Enable the A20 gate */
         if (enable_a20()) {
                 puts("A20 gate not responding, unable to boot...\n");