Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/gi…

…t/rric/oprofile into perf/urgent
mariux64 · Sep 27, 2010 · c7a27aa · c7a27aa
2 parents 63e6be6 + bb7ab78
commit c7a27aa
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
@@ -674,6 +674,7 @@ static int __init ppro_init(char **cpu_type)
 	case 0x0f:
 	case 0x16:
 	case 0x17:
+	case 0x1d:
 		*cpu_type = "i386/core_2";
 		break;
 	case 0x1a: