From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Mon, 22 Aug 2005 05:05:44 +0000 (+0000)
Subject: Xen used the i386 version this file, which was modified to support kexec.
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~92
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4702e00736b1f0ccadadfaf852572f59d0c36f6e;p=linux-2.6.git

Xen used the i386 version this file, which was modified to support kexec.
Unfortunately, the kexec patch prevented a xenU from starting correctly.
Removed kexec patch and created separate vmlinux.lds.S file for xen.
---

diff --git a/arch/xen/kernel/vmlinux.lds.S b/arch/xen/kernel/vmlinux.lds.S
index ef408828d..e93cddfda 100644
--- a/arch/xen/kernel/vmlinux.lds.S
+++ b/arch/xen/kernel/vmlinux.lds.S
@@ -2,7 +2,6 @@
  * Written by Martin Mares <mj@atrey.karlin.mff.cuni.cz>;
  */
 
-#define LOAD_OFFSET __PAGE_OFFSET
 
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/thread_info.h>
@@ -12,6 +11,7 @@
 OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
 OUTPUT_ARCH(i386)
 #ifdef ALK_KEXEC	
+#define LOAD_OFFSET __PAGE_OFFSET
 #define KERN_PHYS_OFFSET (CONFIG_KERN_PHYS_OFFSET * 0x100000)
 ENTRY(phys_startup_32)
 jiffies = jiffies_64;