Small fix for VMX Core2 perfctr access.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/x86/oprofile/nmi_int.c b/xen/arch/x86/oprofile/nmi_int.c
index 7fb72eb7183dfd8a00c2f91681051556ce1ffe76..999a63be4cf97a43d4e1142b9a3ca588510ffe24 100644 (file)
--- a/xen/arch/x86/oprofile/nmi_int.c
+++ b/xen/arch/x86/oprofile/nmi_int.c
@@ -291,13 +291,15 @@ static int __init p4_init(char ** cpu_type)
 }
 
 
+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. "