Commit 0d2b5490 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'urgent' of... 

Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
parents 05ed160e c33f543d

arch/x86/oprofile/nmi_int.c

+3 −1
Original line number Diff line number Diff line
@@ -671,7 +671,9 @@ static int __init ppro_init(char **cpu_type) 
	case 14:

		*cpu_type = "i386/core";

		break;

	case 15: case 23:

	case 0x0f:

	case 0x16:

	case 0x17:

		*cpu_type = "i386/core_2";

		break;

	case 0x1a: