Again pretty self explanatory. Should be merged into 024-head.patch
Signed-off-by: Ian Campbell <[EMAIL PROTECTED]>
diff -r bc6940cd08ed arch/i386/paravirt-xen/xen-head.S
--- a/arch/i386/paravirt-xen/xen-head.S Wed Aug 23 15:12:48 2006 +0100
+++ b/arch/i386/paravirt-xen/xen-head.S Wed Aug 23 15:14:47 2006 +0100
@@ -2,6 +2,7 @@
place in head.S */
#include <linux/elfnote.h>
+#include <xen/interface/elfnote.h>
#define VIRT_ENTRY_OFFSET 0x1000
.org VIRT_ENTRY_OFFSET
@@ -56,19 +57,16 @@ ENTRY(hypercall_page)
.byte 0
.previous
-#define XEN_INFO 0 /* name=value pair */
-#define XEN_ENTRY 1 /* entrypoint */
-#define XEN_HYPERCALL 2 /* hypercall page address (not pfn) */
-
- ELFNOTE "Xen", XEN_INFO, .asciz "GUEST_OS=linux"
- ELFNOTE "Xen", XEN_INFO, .asciz "GUEST_VER=2.6"
- ELFNOTE "Xen", XEN_INFO, .asciz "XEN_VER=xen-3.0"
- ELFNOTE "Xen", XEN_ENTRY, .long startup_xen
- ELFNOTE "Xen", XEN_HYPERCALL, .long hypercall_page
- ELFNOTE "Xen", XEN_INFO, .asciz
"FEATURES=!writable_page_tables|!auto_translated_physmap"
+ 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_FEATURES, .asciz,
"!writable_page_tables|!auto_translated_physmap")
#ifdef CONFIG_X86_PAE
- ELFNOTE "Xen", XEN_INFO, .asciz "PAE=yes"
+ ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz, "yes")
#else
- ELFNOTE "Xen", XEN_INFO, .asciz "PAE=no"
+ ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz, "no")
#endif
- ELFNOTE "Xen", XEN_INFO, .asciz "LOADER=generic"
+ ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz, "generic")
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/virtualization
