x86_32: Fix build after RDTSCP and memory hotplug changes.

Signed-off-by: Yunhong Jiang <yunhong.jiang@intel.com>
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>

diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index be4eb7b4f6e9244f559353b23b3568004e078e3a..3dbada3c5b7e007702eef9801a8a2d0b6a3e9590 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -2558,6 +2558,7 @@ asmlinkage void vmx_vmexit_handler(struct cpu_user_regs *regs)
         __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(struct cpu_user_regs *regs)
         regs->ecx = (uint32_t)(guest_state->msrs[VMX_INDEX_MSR_TSC_AUX]);
         break;
     }
+#endif
     case EXIT_REASON_VMCALL:
     {
         int rc;

diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h
index 4b9cdc82871c175a6e748f8dc87a6e2c85da0375..0aa5d1b0b0dc0f11af5f15cdde1f7b1b2e521cc1 100644 (file)
--- a/xen/include/asm-x86/mm.h
+++ b/xen/include/asm-x86/mm.h
@@ -480,12 +480,14 @@ int audit_adjust_pgtables(struct domain *d, int dir, int noisy);
 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