ia64/xen-unstable

changeset 18940:768759d4e319

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>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Dec 18 11:29:33 2008 +0000 (2008-12-18)
parents c2dad16819b5
children 0a393ba0ec0a
files xen/arch/x86/oprofile/nmi_int.c
line diff
     1.1 --- a/xen/arch/x86/oprofile/nmi_int.c	Thu Dec 18 11:28:25 2008 +0000
     1.2 +++ b/xen/arch/x86/oprofile/nmi_int.c	Thu Dec 18 11:29:33 2008 +0000
     1.3 @@ -65,6 +65,8 @@ int passive_domain_do_wrmsr(struct cpu_u
     1.4  	int type, index;
     1.5  	struct vpmu_struct *vpmu = vcpu_vpmu(current);
     1.6  
     1.7 +	if ( model == NULL )
     1.8 +		return 0;
     1.9  	if ( model->is_arch_pmu_msr == NULL )
    1.10  		return 0;
    1.11  	if ( !model->is_arch_pmu_msr((u64)regs->ecx, &type, &index) )
    1.12 @@ -366,11 +368,10 @@ static int __init ppro_init(char ** cpu_
    1.13  	case 14:
    1.14  		*cpu_type = "i386/core";
    1.15  		break;
    1.16 -	case 15: case 23:
    1.17 -		*cpu_type = "i386/core_2";
    1.18 -		ppro_has_global_ctrl = 1;
    1.19 -		break;
    1.20 +	case 15:
    1.21 +	case 23:
    1.22  	case 26:
    1.23 +	case 29:
    1.24  		*cpu_type = "i386/core_2";
    1.25  		ppro_has_global_ctrl = 1;
    1.26  		break;