diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-09-27 09:48:44 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-27 09:48:44 +0200 |
| commit | c7a27aa4652c63172489a73f3961455650a79a7f (patch) | |
| tree | 9251ba2b3477db1a46b51e0a3ab9c415cd9432cc | |
| parent | 63e6be6d98e1a2bcdca86872b67052e51ab6afa1 (diff) | |
| parent | bb7ab785ad05a97a2c9ffb3a06547ed39f3133e8 (diff) | |
| download | linux-c7a27aa4652c63172489a73f3961455650a79a7f.tar.gz linux-c7a27aa4652c63172489a73f3961455650a79a7f.tar.bz2 linux-c7a27aa4652c63172489a73f3961455650a79a7f.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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index 009b819f48d0..f1575c9a2572 100644 --- 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: |