# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID a2c26a896725a65398f5e28107adbdb32bae7854
# Parent 2c5bed93ffbcc4585a5bdaf4c3224183735942eb
[XEN] Remove use of 'inline' on functions accessed via pointers.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
xen/arch/x86/hvm/vmx/vmx.c | 7 +++++++
xen/arch/x86/mm/shadow/multi.c | 8 ++++----
xen/include/asm-x86/hvm/vmx/vmx.h | 7 -------
3 files changed, 11 insertions(+), 11 deletions(-)
diff -r 2c5bed93ffbc -r a2c26a896725 xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c Thu Nov 30 17:21:52 2006 +0000
+++ b/xen/arch/x86/hvm/vmx/vmx.c Thu Nov 30 17:24:18 2006 +0000
@@ -700,6 +700,13 @@ static int vmx_pae_enabled(struct vcpu *
{
unsigned long cr4 = v->arch.hvm_vmx.cpu_shadow_cr4;
return (vmx_paging_enabled(v) && (cr4 & X86_CR4_PAE));
+}
+
+/* Works only for vcpu == current */
+static void vmx_update_host_cr3(struct vcpu *v)
+{
+ ASSERT(v == current);
+ __vmwrite(HOST_CR3, v->arch.cr3);
}
static void vmx_inject_exception(unsigned int trapnr, int errcode)
diff -r 2c5bed93ffbc -r a2c26a896725 xen/arch/x86/mm/shadow/multi.c
--- a/xen/arch/x86/mm/shadow/multi.c Thu Nov 30 17:21:52 2006 +0000
+++ b/xen/arch/x86/mm/shadow/multi.c Thu Nov 30 17:24:18 2006 +0000
@@ -581,7 +581,7 @@ guest_index(void *ptr)
return (u32)((unsigned long)ptr & ~PAGE_MASK) / sizeof(guest_l1e_t);
}
-static inline u32
+static u32
shadow_l1_index(mfn_t *smfn, u32 guest_index)
{
#if (GUEST_PAGING_LEVELS == 2) && (SHADOW_PAGING_LEVELS != 2)
@@ -593,7 +593,7 @@ shadow_l1_index(mfn_t *smfn, u32 guest_i
#endif
}
-static inline u32
+static u32
shadow_l2_index(mfn_t *smfn, u32 guest_index)
{
#if (GUEST_PAGING_LEVELS == 2) && (SHADOW_PAGING_LEVELS != 2)
@@ -613,13 +613,13 @@ shadow_l2_index(mfn_t *smfn, u32 guest_i
#if GUEST_PAGING_LEVELS >= 4
-static inline u32
+static u32
shadow_l3_index(mfn_t *smfn, u32 guest_index)
{
return guest_index;
}
-static inline u32
+static u32
shadow_l4_index(mfn_t *smfn, u32 guest_index)
{
return guest_index;
diff -r 2c5bed93ffbc -r a2c26a896725 xen/include/asm-x86/hvm/vmx/vmx.h
--- a/xen/include/asm-x86/hvm/vmx/vmx.h Thu Nov 30 17:21:52 2006 +0000
+++ b/xen/include/asm-x86/hvm/vmx/vmx.h Thu Nov 30 17:24:18 2006 +0000
@@ -272,13 +272,6 @@ static inline int vmx_lme_is_set(struct
return efer & EFER_LME;
}
-/* Works only for vcpu == current */
-static inline void vmx_update_host_cr3(struct vcpu *v)
-{
- ASSERT(v == current);
- __vmwrite(HOST_CR3, v->arch.cr3);
-}
-
static inline int vmx_pgbit_test(struct vcpu *v)
{
unsigned long cr0 = v->arch.hvm_vmx.cpu_shadow_cr0;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home