diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-09-16 10:36:19 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-16 10:36:19 -0400 |
| commit | 0d2b54904d8db26663117ab82697cae5cdf56f72 (patch) | |
| tree | 1c0181094817f3967bc5c9a1826c2469e2962539 /arch | |
| parent | 05ed160e89baf7f5fb3432d527fec467d2493626 (diff) | |
| parent | c33f543d320843e1732534c3931da4bbd18e6c14 (diff) | |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/oprofile/nmi_int.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index cfe4faabb0f6..009b819f48d0 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c | |||
| @@ -671,7 +671,9 @@ static int __init ppro_init(char **cpu_type) | |||
| 671 | case 14: | 671 | case 14: |
| 672 | *cpu_type = "i386/core"; | 672 | *cpu_type = "i386/core"; |
| 673 | break; | 673 | break; |
| 674 | case 15: case 23: | 674 | case 0x0f: |
| 675 | case 0x16: | ||
| 676 | case 0x17: | ||
| 675 | *cpu_type = "i386/core_2"; | 677 | *cpu_type = "i386/core_2"; |
| 676 | break; | 678 | break; |
| 677 | case 0x1a: | 679 | case 0x1a: |