ia64/xen-unstable

changeset 5926:e922662b7839

... so it builds again and also add a note to the xen elf header
that this kernel should be booted in shadow-translated mode.
author kaf24@firebug.cl.cam.ac.uk
date Fri Jul 29 10:24:06 2005 +0000 (2005-07-29)
parents 691cd6f65739
children 555b315b482d
files linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S linux-2.6-xen-sparse/include/asm-xen/hypervisor.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S	Fri Jul 29 10:23:07 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S	Fri Jul 29 10:24:06 2005 +0000
     1.3 @@ -10,6 +10,9 @@
     1.4  #else
     1.5  	.ascii	",PAE=no"
     1.6  #endif
     1.7 +#ifdef CONFIG_XEN_SHADOW_MODE
     1.8 +	.ascii	",SHADOW=translate"
     1.9 +#endif
    1.10  	.ascii	",LOADER=generic"
    1.11  	.byte	0
    1.12  
     2.1 --- a/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h	Fri Jul 29 10:23:07 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h	Fri Jul 29 10:24:06 2005 +0000
     2.3 @@ -97,8 +97,8 @@ void xen_pmd_unpin(unsigned long ptr); /
     2.4  void xen_pte_pin(unsigned long ptr);
     2.5  void xen_pte_unpin(unsigned long ptr);
     2.6  #else
     2.7 -#define xen_l1_entry_update(_p, _v) set_pte((_p), (pte_t){(_v)})
     2.8 -#define xen_l2_entry_update(_p, _v) set_pgd((_p), (pgd_t){(_v)})
     2.9 +#define xen_l1_entry_update(_p, _v) set_pte((_p), (_v))
    2.10 +#define xen_l2_entry_update(_p, _v) set_pgd((_p), (_v))
    2.11  #define xen_pgd_pin(_p)   ((void)0)
    2.12  #define xen_pgd_unpin(_p) ((void)0)
    2.13  #define xen_pte_pin(_p)   ((void)0)