[Xen-changelog] [xen-unstable] Small fix for VMX Core2 perfctr access.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1201772492 0
# Node ID 1b4fa085bec6d4bda162d830a124492388377326
# Parent  475f4323b86a9c15e81e31ba9a25d19c5fa51eb5
Small fix for VMX Core2 perfctr access.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/oprofile/nmi_int.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff -r 475f4323b86a -r 1b4fa085bec6 xen/arch/x86/oprofile/nmi_int.c
--- a/xen/arch/x86/oprofile/nmi_int.c   Thu Jan 31 09:39:44 2008 +0000
+++ b/xen/arch/x86/oprofile/nmi_int.c   Thu Jan 31 09:41:32 2008 +0000
@@ -291,13 +291,15 @@ static int __init p4_init(char ** cpu_ty
 }
 
 
+extern int ppro_has_global_ctrl;
 static int __init ppro_init(char ** cpu_type)
 {
        __u8 cpu_model = current_cpu_data.x86_model;
 
-       if (cpu_model == 15 || cpu_model == 23)
+       if (cpu_model == 15 || cpu_model == 23) {
                *cpu_type = "i386/core_2";
-       else if (cpu_model == 14)
+               ppro_has_global_ctrl = 1;
+       } else if (cpu_model == 14)
                *cpu_type = "i386/core";
        else if (cpu_model > 13) {
                printk("xenoprof: Initialization failed. "

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