Jan Beulich
2007-Jun-12 07:05 UTC
[Xen-devel] [PATCH] linux/x86-64: remove non-native entry point name
Signed-off-by: Jan Beulich <jbeulich@novell.com> Index: head-2007-05-31/arch/x86_64/Makefile ==================================================================--- head-2007-05-31.orig/arch/x86_64/Makefile 2007-06-05 08:05:31.000000000 +0200 +++ head-2007-05-31/arch/x86_64/Makefile 2007-06-01 17:02:16.000000000 +0200 @@ -81,7 +81,7 @@ PHONY += bzImage bzlilo install archmrpr 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" Index: head-2007-05-31/arch/x86_64/kernel/head-xen.S ==================================================================--- head-2007-05-31.orig/arch/x86_64/kernel/head-xen.S 2007-06-05 08:09:43.000000000 +0200 +++ head-2007-05-31/arch/x86_64/kernel/head-xen.S 2007-06-05 08:10:34.000000000 +0200 @@ -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-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel