1.1 --- a/xen/arch/x86/hvm/vmx/vmx.c	Thu Nov 30 17:21:52 2006 +0000
     1.2 +++ b/xen/arch/x86/hvm/vmx/vmx.c	Thu Nov 30 17:24:18 2006 +0000
     1.3 @@ -702,6 +702,13 @@ static int vmx_pae_enabled(struct vcpu *
     1.4      return (vmx_paging_enabled(v) && (cr4 & X86_CR4_PAE));
     1.5  }
     1.6  
     1.7 +/* Works only for vcpu == current */
     1.8 +static void vmx_update_host_cr3(struct vcpu *v)
     1.9 +{
    1.10 +    ASSERT(v == current);
    1.11 +    __vmwrite(HOST_CR3, v->arch.cr3);
    1.12 +}
    1.13 +
    1.14  static void vmx_inject_exception(unsigned int trapnr, int errcode)
    1.15  {
    1.16      vmx_inject_hw_exception(current, trapnr, errcode);

     2.1 --- a/xen/arch/x86/mm/shadow/multi.c	Thu Nov 30 17:21:52 2006 +0000
     2.2 +++ b/xen/arch/x86/mm/shadow/multi.c	Thu Nov 30 17:24:18 2006 +0000
     2.3 @@ -581,7 +581,7 @@ guest_index(void *ptr)
     2.4      return (u32)((unsigned long)ptr & ~PAGE_MASK) / sizeof(guest_l1e_t);
     2.5  }
     2.6  
     2.7 -static inline u32
     2.8 +static u32
     2.9  shadow_l1_index(mfn_t *smfn, u32 guest_index)
    2.10  {
    2.11  #if (GUEST_PAGING_LEVELS == 2) && (SHADOW_PAGING_LEVELS != 2)
    2.12 @@ -593,7 +593,7 @@ shadow_l1_index(mfn_t *smfn, u32 guest_i
    2.13  #endif
    2.14  }
    2.15  
    2.16 -static inline u32
    2.17 +static u32
    2.18  shadow_l2_index(mfn_t *smfn, u32 guest_index)
    2.19  {
    2.20  #if (GUEST_PAGING_LEVELS == 2) && (SHADOW_PAGING_LEVELS != 2)
    2.21 @@ -613,13 +613,13 @@ shadow_l2_index(mfn_t *smfn, u32 guest_i
    2.22  
    2.23  #if GUEST_PAGING_LEVELS >= 4
    2.24  
    2.25 -static inline u32
    2.26 +static u32
    2.27  shadow_l3_index(mfn_t *smfn, u32 guest_index)
    2.28  {
    2.29      return guest_index;
    2.30  }
    2.31  
    2.32 -static inline u32
    2.33 +static u32
    2.34  shadow_l4_index(mfn_t *smfn, u32 guest_index)
    2.35  {
    2.36      return guest_index;

     3.1 --- a/xen/include/asm-x86/hvm/vmx/vmx.h	Thu Nov 30 17:21:52 2006 +0000
     3.2 +++ b/xen/include/asm-x86/hvm/vmx/vmx.h	Thu Nov 30 17:24:18 2006 +0000
     3.3 @@ -272,13 +272,6 @@ static inline int vmx_lme_is_set(struct 
     3.4      return efer & EFER_LME;
     3.5  }
     3.6  
     3.7 -/* Works only for vcpu == current */
     3.8 -static inline void vmx_update_host_cr3(struct vcpu *v)
     3.9 -{
    3.10 -    ASSERT(v == current);
    3.11 -    __vmwrite(HOST_CR3, v->arch.cr3);
    3.12 -}
    3.13 -
    3.14  static inline int vmx_pgbit_test(struct vcpu *v)
    3.15  {
    3.16      unsigned long cr0 = v->arch.hvm_vmx.cpu_shadow_cr0;