[Xen-changelog] Update to Linux 2.6.9.

[BitKeeper B. <ri...@su...>]

ChangeSet 1.1456.1.1, 2004/10/28 18:23:36+01:00, cl...@fr...

	Update to Linux 2.6.9.



 vmlinux.lds.S |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)


diff -Nru a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/vmlinux.lds.S b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/vmlinux.lds.S
--- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/vmlinux.lds.S	2004-10-29 07:00:40 -04:00
+++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/vmlinux.lds.S	2004-10-29 07:00:40 -04:00
@@ -4,6 +4,7 @@
 
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/thread_info.h>
+#include <asm/page.h>
 
 OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
 OUTPUT_ARCH(i386)
@@ -11,12 +12,13 @@
 jiffies = jiffies_64;
 SECTIONS
 {
-  . = 0xC0000000 + 0x100000;
+  . = __PAGE_OFFSET + 0x100000;
   /* read-only */
   _text = .;			/* Text and read-only data */
   .text : {
 	*(.text)
 	SCHED_TEXT
+	LOCK_TEXT
 	*(.fixup)
 	*(.gnu.warning)
 	} = 0x9090
@@ -66,9 +68,6 @@
   __setup_start = .;
   .init.setup : { *(.init.setup) }
   __setup_end = .;
-  __start___param = .;
-  __param : { *(__param) }
-  __stop___param = .;
   __initcall_start = .;
   .initcall.init : {
 	*(.initcall1.init)