From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 31 Jan 2008 09:41:32 +0000 (+0000)
Subject: Small fix for VMX Core2 perfctr access.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14341^2~23
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8013b9017de9f36b9f163d4daf2ec01d1bc0f1a3;p=xen.git

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 7fb72eb718..999a63be4c 100644
--- 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. "