[Xen-changelog] ... so it builds again and also add a note to the xen elf header

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID e922662b783911a28daafae9281ce6726b55df56
# Parent  691cd6f6573955bea673e2d15077a451d26bfae8
... so it builds again and also add a note to the xen elf header
that this kernel should be booted in shadow-translated mode.

diff -r 691cd6f65739 -r e922662b7839 
linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S  Fri Jul 29 10:23:07 2005
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S  Fri Jul 29 10:24:06 2005
@@ -9,6 +9,9 @@
        .ascii  ",PAE=yes"
 #else
        .ascii  ",PAE=no"
+#endif
+#ifdef CONFIG_XEN_SHADOW_MODE
+       .ascii  ",SHADOW=translate"
 #endif
        .ascii  ",LOADER=generic"
        .byte   0
diff -r 691cd6f65739 -r e922662b7839 
linux-2.6-xen-sparse/include/asm-xen/hypervisor.h
--- a/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h Fri Jul 29 10:23:07 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h Fri Jul 29 10:24:06 2005
@@ -97,8 +97,8 @@
 void xen_pte_pin(unsigned long ptr);
 void xen_pte_unpin(unsigned long ptr);
 #else
-#define xen_l1_entry_update(_p, _v) set_pte((_p), (pte_t){(_v)})
-#define xen_l2_entry_update(_p, _v) set_pgd((_p), (pgd_t){(_v)})
+#define xen_l1_entry_update(_p, _v) set_pte((_p), (_v))
+#define xen_l2_entry_update(_p, _v) set_pgd((_p), (_v))
 #define xen_pgd_pin(_p)   ((void)0)
 #define xen_pgd_unpin(_p) ((void)0)
 #define xen_pte_pin(_p)   ((void)0)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog