debuggers.hg

changeset 20688:0cb22e32795c

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>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Dec 14 09:48:47 2009 +0000 (2009-12-14)
parents 92d0cfcff6dd
children 23bc248302df
files xen/arch/x86/hvm/vmx/vmx.c xen/include/asm-x86/mm.h
line diff
     1.1 --- a/xen/arch/x86/hvm/vmx/vmx.c	Mon Dec 14 09:36:26 2009 +0000
     1.2 +++ b/xen/arch/x86/hvm/vmx/vmx.c	Mon Dec 14 09:48:47 2009 +0000
     1.3 @@ -2558,6 +2558,7 @@ asmlinkage void vmx_vmexit_handler(struc
     1.4          __update_guest_eip(inst_len);
     1.5          hvm_rdtsc_intercept(regs);
     1.6          break;
     1.7 +#ifdef __x86_64__
     1.8      case EXIT_REASON_RDTSCP:
     1.9      {
    1.10          struct vmx_msr_state *guest_state = &v->arch.hvm_vmx.msr_state;
    1.11 @@ -2567,6 +2568,7 @@ asmlinkage void vmx_vmexit_handler(struc
    1.12          regs->ecx = (uint32_t)(guest_state->msrs[VMX_INDEX_MSR_TSC_AUX]);
    1.13          break;
    1.14      }
    1.15 +#endif
    1.16      case EXIT_REASON_VMCALL:
    1.17      {
    1.18          int rc;
     2.1 --- a/xen/include/asm-x86/mm.h	Mon Dec 14 09:36:26 2009 +0000
     2.2 +++ b/xen/include/asm-x86/mm.h	Mon Dec 14 09:48:47 2009 +0000
     2.3 @@ -480,12 +480,14 @@ int audit_adjust_pgtables(struct domain 
     2.4  extern int pagefault_by_memadd(unsigned long addr, struct cpu_user_regs *regs);
     2.5  extern int handle_memadd_fault(unsigned long addr, struct cpu_user_regs *regs);
     2.6  #else
     2.7 -int pagefault_by_memadd(unsigned long addr, struct cpu_user_regs *regs)
     2.8 +static inline int pagefault_by_memadd(unsigned long addr,
     2.9 +                                      struct cpu_user_regs *regs)
    2.10  {
    2.11      return 0;
    2.12  }
    2.13  
    2.14 -int handle_memadd_fault(unsigned long addr, struct cpu_user_regs *regs)
    2.15 +static inline int handle_memadd_fault(unsigned long addr,
    2.16 +                                      struct cpu_user_regs *regs)
    2.17  {
    2.18      return 0;
    2.19  }
    2.20 @@ -533,7 +535,10 @@ int map_ldt_shadow_page(unsigned int);
    2.21  #ifdef CONFIG_X86_64
    2.22  extern int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm);
    2.23  #else
    2.24 -int memory_add(uint64_t spfn, uint64_t epfn, uint32_t pxm) {return -ENOSYS};
    2.25 +static inline int memory_add(uint64_t spfn, uint64_t epfn, uint32_t pxm)
    2.26 +{
    2.27 +    return -ENOSYS;
    2.28 +}
    2.29  #endif
    2.30  
    2.31  #ifdef CONFIG_COMPAT