diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-09-16 16:36:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-16 16:36:19 +0200 |
| commit | 0d2b54904d8db26663117ab82697cae5cdf56f72 (patch) | |
| tree | 1c0181094817f3967bc5c9a1826c2469e2962539 | |
| parent | 05ed160e89baf7f5fb3432d527fec467d2493626 (diff) | |
| parent | c33f543d320843e1732534c3931da4bbd18e6c14 (diff) | |
| download | linux-stable-0d2b54904d8db26663117ab82697cae5cdf56f72.tar.gz linux-stable-0d2b54904d8db26663117ab82697cae5cdf56f72.tar.bz2 linux-stable-0d2b54904d8db26663117ab82697cae5cdf56f72.zip | |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
| -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) 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: |