From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 18 Dec 2008 11:29:33 +0000 (+0000)
Subject: xenoprof: Add support for Intel Dunnington cores.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14026^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dce021d06abfae3cb5613c1a7856cff56f79c5ad;p=xen.git

xenoprof: Add support for Intel Dunnington cores.

Signed-off-by: Xiaowei Yang <Xiaowei.yang@intel.com>
Signed-off-by: Ting Zhou <ting.g.zhou@intel.com>
---

diff --git a/xen/arch/x86/oprofile/nmi_int.c b/xen/arch/x86/oprofile/nmi_int.c
index 4f62262cec..ef5d1227fd 100644
--- a/xen/arch/x86/oprofile/nmi_int.c
+++ b/xen/arch/x86/oprofile/nmi_int.c
@@ -65,6 +65,8 @@ int passive_domain_do_wrmsr(struct cpu_user_regs *regs)
 	int type, index;
 	struct vpmu_struct *vpmu = vcpu_vpmu(current);
 
+	if ( model == NULL )
+		return 0;
 	if ( model->is_arch_pmu_msr == NULL )
 		return 0;
 	if ( !model->is_arch_pmu_msr((u64)regs->ecx, &type, &index) )
@@ -366,11 +368,10 @@ static int __init ppro_init(char ** cpu_type)
 	case 14:
 		*cpu_type = "i386/core";
 		break;
-	case 15: case 23:
-		*cpu_type = "i386/core_2";
-		ppro_has_global_ctrl = 1;
-		break;
+	case 15:
+	case 23:
 	case 26:
+	case 29:
 		*cpu_type = "i386/core_2";
 		ppro_has_global_ctrl = 1;
 		break;