[Xen-changelog] [xen-unstable] xenoprof: Add support for Intel Dunnington cores.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1229599773 0
# Node ID 768759d4e319f8c46a8558782a9bf1c7982e662d
# Parent  c2dad16819b54c2c4b2bb0e9e89f71c279eaf156
xenoprof: Add support for Intel Dunnington cores.

Signed-off-by: Xiaowei Yang <Xiaowei.yang@xxxxxxxxx>
Signed-off-by: Ting Zhou <ting.g.zhou@xxxxxxxxx>
---
 xen/arch/x86/oprofile/nmi_int.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff -r c2dad16819b5 -r 768759d4e319 xen/arch/x86/oprofile/nmi_int.c
--- a/xen/arch/x86/oprofile/nmi_int.c   Thu Dec 18 11:28:25 2008 +0000
+++ b/xen/arch/x86/oprofile/nmi_int.c   Thu Dec 18 11:29:33 2008 +0000
@@ -65,6 +65,8 @@ int passive_domain_do_wrmsr(struct cpu_u
        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_
        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;

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