[Xen-changelog] [xen-unstable] x86, xenoprof: Support Intel Penryn processors.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1200920924 0
# Node ID 60ee6f97cb19d24214f69627740b3a6719d056e4
# Parent  3c49ae5641b00e6a0744a19973f207b236d98648
x86, xenoprof: Support Intel Penryn processors.
Signed-off-by: Xiaowei Yang <xiaowei.yang@xxxxxxxxx>=20
---
 xen/arch/x86/oprofile/nmi_int.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff -r 3c49ae5641b0 -r 60ee6f97cb19 xen/arch/x86/oprofile/nmi_int.c
--- a/xen/arch/x86/oprofile/nmi_int.c   Mon Jan 21 11:20:52 2008 +0000
+++ b/xen/arch/x86/oprofile/nmi_int.c   Mon Jan 21 13:08:44 2008 +0000
@@ -295,17 +295,16 @@ static int __init ppro_init(char ** cpu_
 {
        __u8 cpu_model = current_cpu_data.x86_model;
 
-       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) {
                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)
-               *cpu_type = "i386/core_2";
-       else if (cpu_model == 14)
-               *cpu_type = "i386/core";
-       else if (cpu_model == 9)
+       } else if (cpu_model == 9)
                *cpu_type = "i386/p6_mobile";
        else if (cpu_model > 5)
                *cpu_type = "i386/piii";

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