1.1 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h	Fri Jul 28 17:23:15 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h	Fri Jul 28 17:25:20 2006 +0100
     1.3 @@ -187,16 +187,14 @@ MULTI_update_va_mapping(
     1.4      mcl->args[0] = va;
     1.5  #if defined(CONFIG_X86_64)
     1.6      mcl->args[1] = new_val.pte;
     1.7 -    mcl->args[2] = flags;
     1.8  #elif defined(CONFIG_X86_PAE)
     1.9      mcl->args[1] = new_val.pte_low;
    1.10      mcl->args[2] = new_val.pte_high;
    1.11 -    mcl->args[3] = flags;
    1.12  #else
    1.13      mcl->args[1] = new_val.pte_low;
    1.14      mcl->args[2] = 0;
    1.15 -    mcl->args[3] = flags;
    1.16  #endif
    1.17 +    mcl->args[MULTI_UVMFLAGS_INDEX] = flags;
    1.18  }
    1.19  
    1.20  static inline void
    1.21 @@ -208,19 +206,15 @@ MULTI_update_va_mapping_otherdomain(
    1.22      mcl->args[0] = va;
    1.23  #if defined(CONFIG_X86_64)
    1.24      mcl->args[1] = new_val.pte;
    1.25 -    mcl->args[2] = flags;
    1.26 -    mcl->args[3] = domid;
    1.27  #elif defined(CONFIG_X86_PAE)
    1.28      mcl->args[1] = new_val.pte_low;
    1.29      mcl->args[2] = new_val.pte_high;
    1.30 -    mcl->args[3] = flags;
    1.31 -    mcl->args[4] = domid;
    1.32  #else
    1.33      mcl->args[1] = new_val.pte_low;
    1.34      mcl->args[2] = 0;
    1.35 -    mcl->args[3] = flags;
    1.36 -    mcl->args[4] = domid;
    1.37  #endif
    1.38 +    mcl->args[MULTI_UVMFLAGS_INDEX] = flags;
    1.39 +    mcl->args[MULTI_UVMDOMID_INDEX] = domid;
    1.40  }
    1.41  
    1.42  #endif /* __HYPERVISOR_H__ */