[Xen-changelog] [linux-2.6.18-xen] linux/x86-64: remove non-native entry point name

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1181643155 -3600
# Node ID 7c5fc63cd0aab441945238e5f7f19e087c59968b
# Parent  dbcc60b9a21535e6bd4847ae9a71d7f869ae93ed
linux/x86-64: remove non-native entry point name
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 arch/x86_64/Makefile          |    2 +-
 arch/x86_64/kernel/head-xen.S |    5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff -r dbcc60b9a215 -r 7c5fc63cd0aa arch/x86_64/Makefile
--- a/arch/x86_64/Makefile      Tue Jun 12 11:12:05 2007 +0100
+++ b/arch/x86_64/Makefile      Tue Jun 12 11:12:35 2007 +0100
@@ -81,7 +81,7 @@ ifdef CONFIG_XEN
 ifdef CONFIG_XEN
 CPPFLAGS := -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS)
 head-y := arch/x86_64/kernel/head-xen.o arch/x86_64/kernel/head64-xen.o 
arch/x86_64/kernel/init_task.o
-LDFLAGS_vmlinux := -e _start
+LDFLAGS_vmlinux := -e startup_64
 boot := arch/i386/boot-xen
 .PHONY: vmlinuz
 #Default target when executing "make"
diff -r dbcc60b9a215 -r 7c5fc63cd0aa arch/x86_64/kernel/head-xen.S
--- a/arch/x86_64/kernel/head-xen.S     Tue Jun 12 11:12:05 2007 +0100
+++ b/arch/x86_64/kernel/head-xen.S     Tue Jun 12 11:12:35 2007 +0100
@@ -27,11 +27,8 @@
 
        .section .bootstrap.text, "ax", @progbits
        .code64
-#define VIRT_ENTRY_OFFSET 0x0
-.org VIRT_ENTRY_OFFSET
        .globl startup_64
 startup_64:
-ENTRY(_start)
        movq $(init_thread_union+THREAD_SIZE-8),%rsp
 
        /* rsi is pointer to startup info structure.
@@ -175,7 +172,7 @@ ENTRY(empty_zero_page)
        .ascii  ",ELF_PADDR_OFFSET=0x"
                utoh __START_KERNEL_map
        .ascii  ",VIRT_ENTRY=0x"
-               utoh (__START_KERNEL_map + __PHYSICAL_START + VIRT_ENTRY_OFFSET)
+               utoh (__START_KERNEL_map + __PHYSICAL_START)
        .ascii  ",HYPERCALL_PAGE=0x"
                utoh (phys_hypercall_page >> PAGE_SHIFT)
        .ascii  ",FEATURES=writable_page_tables"

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog