diff -r a407a8a51319 xen/arch/x86/oprofile/nmi_int.c --- a/xen/arch/x86/oprofile/nmi_int.c Tue Jan 15 21:23:37 2008 +0000 +++ b/xen/arch/x86/oprofile/nmi_int.c Mon Jan 21 00:39:00 2008 +0800 @@ -295,16 +295,12 @@ static int __init ppro_init(char ** cpu_ { __u8 cpu_model = current_cpu_data.x86_model; - if (cpu_model > 15) { - printk("xenoprof: Initialization failed. " - "Intel processor model %d for P6 class family is not " - "supported\n", cpu_model); - return 0; - } - else if (cpu_model == 15) + if (cpu_model == 15 || cpu_model == 23) *cpu_type = "i386/core_2"; else if (cpu_model == 14) *cpu_type = "i386/core"; + else if (cpu_model > 13) + return 0; else if (cpu_model == 9) *cpu_type = "i386/p6_mobile"; else if (cpu_model > 5)