1.1 --- a/xen/arch/x86/oprofile/nmi_int.c	Mon Jan 21 11:20:52 2008 +0000
     1.2 +++ b/xen/arch/x86/oprofile/nmi_int.c	Mon Jan 21 13:08:44 2008 +0000
     1.3 @@ -295,17 +295,16 @@ static int __init ppro_init(char ** cpu_
     1.4  {
     1.5  	__u8 cpu_model = current_cpu_data.x86_model;
     1.6  
     1.7 -	if (cpu_model > 15) {
     1.8 +	if (cpu_model == 15 || cpu_model == 23)
     1.9 +		*cpu_type = "i386/core_2";
    1.10 +	else if (cpu_model == 14)
    1.11 +		*cpu_type = "i386/core";
    1.12 +	else if (cpu_model > 13) {
    1.13  		printk("xenoprof: Initialization failed. "
    1.14  		       "Intel processor model %d for P6 class family is not "
    1.15  		       "supported\n", cpu_model);
    1.16  		return 0;
    1.17 -	}
    1.18 -	else if (cpu_model == 15)
    1.19 -		*cpu_type = "i386/core_2";
    1.20 -	else if (cpu_model == 14)
    1.21 -		*cpu_type = "i386/core";
    1.22 -	else if (cpu_model == 9)
    1.23 +	} else if (cpu_model == 9)
    1.24  		*cpu_type = "i386/p6_mobile";
    1.25  	else if (cpu_model > 5)
    1.26  		*cpu_type = "i386/piii";