summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-07 14:01:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-07 14:01:51 -0700
commit48de8cb7847d040c8892701c1ff3c55eff1f46b4 (patch)
tree073f1fc21abf098d7667fcb898eda441c6b7f393 /arch/x86
parent63634c86365b530af5026d409fd403801abe1e75 (diff)
parent134fbadf028a5977a1b06b0253d3ee33e6f0c642 (diff)
downloadop-kernel-dev-48de8cb7847d040c8892701c1ff3c55eff1f46b4.zip
op-kernel-dev-48de8cb7847d040c8892701c1ff3c55eff1f46b4.tar.gz
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.c1
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 84bfde6..9c794ac 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)
case 26: /* 45 nm nehalem, "Bloomfield" */
case 30: /* 45 nm nehalem, "Lynnfield" */
+ case 46: /* 45 nm nehalem-ex, "Beckton" */
memcpy(hw_cache_event_ids, nehalem_hw_cache_event_ids,
sizeof(hw_cache_event_ids));
OpenPOWER on IntegriCloud