[Xen-changelog] [xen-unstable] x86_32: Fix build after RDTSCP and memory hotplug changes.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1260784127 0
# Node ID 0cb22e32795c8f9a15cc75f8a7aeba54ca5c1ff0
# Parent  92d0cfcff6dd2966e69599c5fb2573d8351fc139
x86_32: Fix build after RDTSCP and memory hotplug changes.

Signed-off-by: Yunhong Jiang <yunhong.jiang@xxxxxxxxx>
Signed-off-by: Dongxiao Xu <dongxiao.xu@xxxxxxxxx>
---
 xen/arch/x86/hvm/vmx/vmx.c |    2 ++
 xen/include/asm-x86/mm.h   |   11 ++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff -r 92d0cfcff6dd -r 0cb22e32795c xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c        Mon Dec 14 09:36:26 2009 +0000
+++ b/xen/arch/x86/hvm/vmx/vmx.c        Mon Dec 14 09:48:47 2009 +0000
@@ -2558,6 +2558,7 @@ asmlinkage void vmx_vmexit_handler(struc
         __update_guest_eip(inst_len);
         hvm_rdtsc_intercept(regs);
         break;
+#ifdef __x86_64__
     case EXIT_REASON_RDTSCP:
     {
         struct vmx_msr_state *guest_state = &v->arch.hvm_vmx.msr_state;
@@ -2567,6 +2568,7 @@ asmlinkage void vmx_vmexit_handler(struc
         regs->ecx = (uint32_t)(guest_state->msrs[VMX_INDEX_MSR_TSC_AUX]);
         break;
     }
+#endif
     case EXIT_REASON_VMCALL:
     {
         int rc;
diff -r 92d0cfcff6dd -r 0cb22e32795c xen/include/asm-x86/mm.h
--- a/xen/include/asm-x86/mm.h  Mon Dec 14 09:36:26 2009 +0000
+++ b/xen/include/asm-x86/mm.h  Mon Dec 14 09:48:47 2009 +0000
@@ -480,12 +480,14 @@ extern int pagefault_by_memadd(unsigned 
 extern int pagefault_by_memadd(unsigned long addr, struct cpu_user_regs *regs);
 extern int handle_memadd_fault(unsigned long addr, struct cpu_user_regs *regs);
 #else
-int pagefault_by_memadd(unsigned long addr, struct cpu_user_regs *regs)
+static inline int pagefault_by_memadd(unsigned long addr,
+                                      struct cpu_user_regs *regs)
 {
     return 0;
 }
 
-int handle_memadd_fault(unsigned long addr, struct cpu_user_regs *regs)
+static inline int handle_memadd_fault(unsigned long addr,
+                                      struct cpu_user_regs *regs)
 {
     return 0;
 }
@@ -533,7 +535,10 @@ int map_ldt_shadow_page(unsigned int);
 #ifdef CONFIG_X86_64
 extern int memory_add(unsigned long spfn, unsigned long epfn, unsigned int 
pxm);
 #else
-int memory_add(uint64_t spfn, uint64_t epfn, uint32_t pxm) {return -ENOSYS};
+static inline int memory_add(uint64_t spfn, uint64_t epfn, uint32_t pxm)
+{
+    return -ENOSYS;
+}
 #endif
 
 #ifdef CONFIG_COMPAT

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