diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-07 17:01:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-07 17:01:51 -0400 |
| commit | 48de8cb7847d040c8892701c1ff3c55eff1f46b4 (patch) | |
| tree | 073f1fc21abf098d7667fcb898eda441c6b7f393 /arch/x86 | |
| parent | 63634c86365b530af5026d409fd403801abe1e75 (diff) | |
| parent | 134fbadf028a5977a1b06b0253d3ee33e6f0c642 (diff) | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf, x86: Enable Nehalem-EX support
perf kmem: Fix breakage introduced by 5a0e3ad slab.h script
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c index 84bfde64a337..9c794ac87837 100644 --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/kernel/cpu/perf_event_intel.c | |||
| @@ -936,6 +936,7 @@ static __init int intel_pmu_init(void) | |||
| 936 | 936 | ||
| 937 | case 26: /* 45 nm nehalem, "Bloomfield" */ | 937 | case 26: /* 45 nm nehalem, "Bloomfield" */ |
| 938 | case 30: /* 45 nm nehalem, "Lynnfield" */ | 938 | case 30: /* 45 nm nehalem, "Lynnfield" */ |
| 939 | case 46: /* 45 nm nehalem-ex, "Beckton" */ | ||
| 939 | memcpy(hw_cache_event_ids, nehalem_hw_cache_event_ids, | 940 | memcpy(hw_cache_event_ids, nehalem_hw_cache_event_ids, |
| 940 | sizeof(hw_cache_event_ids)); | 941 | sizeof(hw_cache_event_ids)); |
| 941 | 942 | ||