With a suitably recent xen the __xen_guest string is no longer required so remove it. See the caveat in 0/5 though! Should be merged into 024-head.patch Signed-off-by: Ian Campbell <ian.campbell at xensource.com> diff -r 82192f4547ab arch/i386/paravirt-xen/xen-head.S --- a/arch/i386/paravirt-xen/xen-head.S Wed Aug 23 15:15:18 2006 +0100 +++ b/arch/i386/paravirt-xen/xen-head.S Wed Aug 23 15:16:01 2006 +0100 @@ -3,7 +3,7 @@ #include <linux/elfnote.h> #include <xen/interface/elfnote.h> - + #define VIRT_ENTRY_OFFSET 0x1000 .org VIRT_ENTRY_OFFSET ENTRY(startup_xen) @@ -20,43 +20,7 @@ 1: jmp 1b # should never return .org HYPERCALL_PAGE_OFFSET ENTRY(hypercall_page) .skip 0x1000 - -/* - * __xen_guest information - */ -.macro utoa value - .if (\value) < 0 || (\value) >= 0x10 - utoa (((\value)>>4)&0x0fffffff) - .endif - .if ((\value) & 0xf) < 10 - .byte '0' + ((\value) & 0xf) - .else - .byte 'A' + ((\value) & 0xf) - 10 - .endif -.endm - -.section __xen_guest - .ascii "GUEST_OS=linux,GUEST_VER=2.6" - .ascii ",XEN_VER=xen-3.0" - .ascii ",VIRT_BASE=0x" - utoa __PAGE_OFFSET - .ascii ",ELF_PADDR_OFFSET=0x0" - .ascii ",VIRT_ENTRY=0x" - utoa (__PAGE_OFFSET + __PHYSICAL_START + VIRT_ENTRY_OFFSET) - .ascii ",HYPERCALL_PAGE=0x" - utoa ((__PHYSICAL_START+HYPERCALL_PAGE_OFFSET)>>PAGE_SHIFT) - .ascii ",FEATURES=!writable_page_tables" - .ascii "|!auto_translated_physmap" -#ifdef CONFIG_X86_PAE - .ascii ",PAE=yes" -#else - .ascii ",PAE=no" -#endif - .ascii ",LOADER=generic" - .byte 0 -.previous - 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")
