From ea3b22637b537b8a0d46e5330773e70de311a52c Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 22 Aug 2007 14:01:59 -0700 Subject: [PATCH] --- yaml --- r: 64266 b: refs/heads/master c: 0852ec8cc1ac108344a219dfcab4043f407ddd9a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/xen/xen-head.S | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9e0fbcaddb6a..b65aefdad7ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abd96ecb298675a21c412a29f5de2f80174d5f18 +refs/heads/master: 0852ec8cc1ac108344a219dfcab4043f407ddd9a diff --git a/trunk/arch/i386/xen/xen-head.S b/trunk/arch/i386/xen/xen-head.S index bc71f3bc4014..f8d6937db2ec 100644 --- a/trunk/arch/i386/xen/xen-head.S +++ b/trunk/arch/i386/xen/xen-head.S @@ -7,20 +7,20 @@ #include #include - .section .init.text +.pushsection .init.text ENTRY(startup_xen) movl %esi,xen_start_info cld movl $(init_thread_union+THREAD_SIZE),%esp jmp xen_start_kernel +.popsection -.pushsection ".bss.page_aligned" +.pushsection .bss.page_aligned .align PAGE_SIZE_asm ENTRY(hypercall_page) .skip 0x1000 .popsection - .section .text ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS, .asciz "linux") ELFNOTE(Xen, XEN_ELFNOTE_GUEST_VERSION, .asciz "2.6") ELFNOTE(Xen, XEN_ELFNOTE_XEN_VERSION, .asciz "xen-3.0")