Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7077c33d authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

xen: make ELF notes work for 32 and 64 bit 



Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Stephen Tweedie <sct@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 48b5db20

arch/x86/xen/xen-head.S

+8 −5
Original line number Diff line number Diff line
@@ -5,7 +5,10 @@ 


#include <linux/elfnote.h>

#include <linux/init.h>



#include <asm/boot.h>

#include <asm/asm.h>



#include <xen/interface/elfnote.h>

#include <asm/xen/interface.h>
@@ -21,21 +24,21 @@ ENTRY(startup_xen) 
.pushsection .text

	.align PAGE_SIZE_asm

ENTRY(hypercall_page)

	.skip 0x1000

	.skip PAGE_SIZE_asm

.popsection



	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")

	ELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE,      .long  __PAGE_OFFSET)

	ELFNOTE(Xen, XEN_ELFNOTE_ENTRY,          .long  startup_xen)

	ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, .long  hypercall_page)

	ELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE,      _ASM_PTR __PAGE_OFFSET)

	ELFNOTE(Xen, XEN_ELFNOTE_ENTRY,          _ASM_PTR startup_xen)

	ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, _ASM_PTR hypercall_page)

	ELFNOTE(Xen, XEN_ELFNOTE_FEATURES,       .asciz "!writable_page_tables|pae_pgdir_above_4gb")

	ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE,       .asciz "yes")

	ELFNOTE(Xen, XEN_ELFNOTE_LOADER,         .asciz "generic")

	ELFNOTE(Xen, XEN_ELFNOTE_L1_MFN_VALID,

		.quad _PAGE_PRESENT; .quad _PAGE_PRESENT)

	ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long 1)

	ELFNOTE(Xen, XEN_ELFNOTE_HV_START_LOW,   .long __HYPERVISOR_VIRT_START)

	ELFNOTE(Xen, XEN_ELFNOTE_HV_START_LOW,   _ASM_PTR __HYPERVISOR_VIRT_START)



#endif /*CONFIG_XEN */