From bfaf410fac45e49a38a306a17a92239db5f290cd Mon Sep 17 00:00:00 2001 From: Benjamin LaHaise Date: Sat, 16 Sep 2006 16:35:46 -0700 Subject: [PATCH] --- yaml --- r: 33947 b: refs/heads/master c: f04b92e97d21b1921c91ec1d6d5e8bbf8606b77a h: refs/heads/master i: 33945: cb74743aa54e9e32855cdc438302410ed38f8c89 33943: 8c26a5116d9beff8cd5781d6d142dee709d807ac v: v3 --- [refs] | 2 +- trunk/arch/i386/oprofile/nmi_int.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 915ad0e00ec8..eda5ab9fb7ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35e4ddfc86df84d32fbd2b9ae3b0b0408afb7e3f +refs/heads/master: f04b92e97d21b1921c91ec1d6d5e8bbf8606b77a diff --git a/trunk/arch/i386/oprofile/nmi_int.c b/trunk/arch/i386/oprofile/nmi_int.c index c8c1df8ff2b4..5f8dc8a21bd7 100644 --- a/trunk/arch/i386/oprofile/nmi_int.c +++ b/trunk/arch/i386/oprofile/nmi_int.c @@ -337,6 +337,8 @@ static int __init ppro_init(char ** cpu_type) if (cpu_model == 14) *cpu_type = "i386/core"; + else if (cpu_model == 15) + *cpu_type = "i386/core_2"; else if (cpu_model > 0xd) return 0; else if (cpu_model == 9) {