[Xen-changelog] [xen-unstable] xenoprof: Small fixes.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1225190115 0
# Node ID 748af1e5d67c5f4604d095f95b9c953ae1d5adcc
# Parent  8d41996e6897c52bbcfacda68e6911c7459eb2b8
xenoprof: Small fixes.

Signed-off-by: Ronghui Duan <ronghui.duan@xxxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/hvm/vmx/vmx.c            |    2 +-
 xen/arch/x86/oprofile/op_model_ppro.c |    2 +-
 xen/include/asm-x86/xenoprof.h        |    3 +++
 xen/include/xen/xenoprof.h            |    3 ---
 4 files changed, 5 insertions(+), 5 deletions(-)

diff -r 8d41996e6897 -r 748af1e5d67c xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c        Mon Oct 27 18:51:52 2008 +0000
+++ b/xen/arch/x86/hvm/vmx/vmx.c        Tue Oct 28 10:35:15 2008 +0000
@@ -26,7 +26,6 @@
 #include <xen/domain_page.h>
 #include <xen/hypercall.h>
 #include <xen/perfc.h>
-#include <xen/xenoprof.h>
 #include <asm/current.h>
 #include <asm/io.h>
 #include <asm/regs.h>
@@ -50,6 +49,7 @@
 #include <asm/hvm/vpt.h>
 #include <public/hvm/save.h>
 #include <asm/hvm/trace.h>
+#include <asm/xenoprof.h>
 
 enum handler_return { HNDL_done, HNDL_unhandled, HNDL_exception_raised };
 
diff -r 8d41996e6897 -r 748af1e5d67c xen/arch/x86/oprofile/op_model_ppro.c
--- a/xen/arch/x86/oprofile/op_model_ppro.c     Mon Oct 27 18:51:52 2008 +0000
+++ b/xen/arch/x86/oprofile/op_model_ppro.c     Tue Oct 28 10:35:15 2008 +0000
@@ -121,7 +121,7 @@ static int ppro_check_ctrs(unsigned int 
                        {
                                if ( IS_ACTIVE(msrs_content[i].control) )
                                {
-                                       msrs_content[i].counter = (low | 
(unsigned long)high << 32);
+                                       msrs_content[i].counter = (low | 
(u64)high << 32);
                                        if ( IS_ENABLE(msrs_content[i].control) 
)
                                                ovf = 2;
                                }
diff -r 8d41996e6897 -r 748af1e5d67c xen/include/asm-x86/xenoprof.h
--- a/xen/include/asm-x86/xenoprof.h    Mon Oct 27 18:51:52 2008 +0000
+++ b/xen/include/asm-x86/xenoprof.h    Tue Oct 28 10:35:15 2008 +0000
@@ -64,6 +64,9 @@ void xenoprof_backtrace(
                  "xenoprof/x86 with autotranslated mode enabled"    \
                  "isn't supported yet\n");                          \
     } while (0)
+int passive_domain_do_rdmsr(struct cpu_user_regs *regs);
+int passive_domain_do_wrmsr(struct cpu_user_regs *regs);
+void passive_domain_destroy(struct vcpu *v);
 
 #endif /* __ASM_X86_XENOPROF_H__ */
 
diff -r 8d41996e6897 -r 748af1e5d67c xen/include/xen/xenoprof.h
--- a/xen/include/xen/xenoprof.h        Mon Oct 27 18:51:52 2008 +0000
+++ b/xen/include/xen/xenoprof.h        Tue Oct 28 10:35:15 2008 +0000
@@ -75,7 +75,4 @@ int acquire_pmu_ownship(int pmu_ownershi
 int acquire_pmu_ownship(int pmu_ownership);
 void release_pmu_ownship(int pmu_ownership);
 
-int passive_domain_do_rdmsr(struct cpu_user_regs *regs);
-int passive_domain_do_wrmsr(struct cpu_user_regs *regs);
-void passive_domain_destroy(struct vcpu *v);
 #endif  /* __XEN__XENOPROF_H__ */

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