ia64/xen-unstable

changeset 18736:748af1e5d67c

xenoprof: Small fixes.

Signed-off-by: Ronghui Duan <ronghui.duan@intel.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Oct 28 10:35:15 2008 +0000 (2008-10-28)
parents 8d41996e6897
children 16eede823854
files xen/arch/x86/hvm/vmx/vmx.c xen/arch/x86/oprofile/op_model_ppro.c xen/include/asm-x86/xenoprof.h xen/include/xen/xenoprof.h
line diff
     1.1 --- a/xen/arch/x86/hvm/vmx/vmx.c	Mon Oct 27 18:51:52 2008 +0000
     1.2 +++ b/xen/arch/x86/hvm/vmx/vmx.c	Tue Oct 28 10:35:15 2008 +0000
     1.3 @@ -26,7 +26,6 @@
     1.4  #include <xen/domain_page.h>
     1.5  #include <xen/hypercall.h>
     1.6  #include <xen/perfc.h>
     1.7 -#include <xen/xenoprof.h>
     1.8  #include <asm/current.h>
     1.9  #include <asm/io.h>
    1.10  #include <asm/regs.h>
    1.11 @@ -50,6 +49,7 @@
    1.12  #include <asm/hvm/vpt.h>
    1.13  #include <public/hvm/save.h>
    1.14  #include <asm/hvm/trace.h>
    1.15 +#include <asm/xenoprof.h>
    1.16  
    1.17  enum handler_return { HNDL_done, HNDL_unhandled, HNDL_exception_raised };
    1.18  
     2.1 --- a/xen/arch/x86/oprofile/op_model_ppro.c	Mon Oct 27 18:51:52 2008 +0000
     2.2 +++ b/xen/arch/x86/oprofile/op_model_ppro.c	Tue Oct 28 10:35:15 2008 +0000
     2.3 @@ -121,7 +121,7 @@ static int ppro_check_ctrs(unsigned int 
     2.4  			{
     2.5  				if ( IS_ACTIVE(msrs_content[i].control) )
     2.6  				{
     2.7 -					msrs_content[i].counter = (low | (unsigned long)high << 32);
     2.8 +					msrs_content[i].counter = (low | (u64)high << 32);
     2.9  					if ( IS_ENABLE(msrs_content[i].control) )
    2.10  						ovf = 2;
    2.11  				}
     3.1 --- a/xen/include/asm-x86/xenoprof.h	Mon Oct 27 18:51:52 2008 +0000
     3.2 +++ b/xen/include/asm-x86/xenoprof.h	Tue Oct 28 10:35:15 2008 +0000
     3.3 @@ -64,6 +64,9 @@ void xenoprof_backtrace(
     3.4                   "xenoprof/x86 with autotranslated mode enabled"    \
     3.5                   "isn't supported yet\n");                          \
     3.6      } while (0)
     3.7 +int passive_domain_do_rdmsr(struct cpu_user_regs *regs);
     3.8 +int passive_domain_do_wrmsr(struct cpu_user_regs *regs);
     3.9 +void passive_domain_destroy(struct vcpu *v);
    3.10  
    3.11  #endif /* __ASM_X86_XENOPROF_H__ */
    3.12  
     4.1 --- a/xen/include/xen/xenoprof.h	Mon Oct 27 18:51:52 2008 +0000
     4.2 +++ b/xen/include/xen/xenoprof.h	Tue Oct 28 10:35:15 2008 +0000
     4.3 @@ -75,7 +75,4 @@ int xenoprof_add_trace(struct domain *d,
     4.4  int acquire_pmu_ownship(int pmu_ownership);
     4.5  void release_pmu_ownship(int pmu_ownership);
     4.6  
     4.7 -int passive_domain_do_rdmsr(struct cpu_user_regs *regs);
     4.8 -int passive_domain_do_wrmsr(struct cpu_user_regs *regs);
     4.9 -void passive_domain_destroy(struct vcpu *v);
    4.10  #endif  /* __XEN__XENOPROF_H__ */