Skip to contentSkip to conversation

perf fixes

GIT PULL Ingo Molnar 1 participant 1 message Apr 6, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest perf-fixes-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf-fixes-for-linus

Thanks,

Ingo

------------------>
Arnaldo Carvalho de Melo (1):
perf kmem: Fix breakage introduced by 5a0e3ad slab.h script

Vince Weaver (1):
perf, x86: Enable Nehalem-EX support

 arch/x86/kernel/cpu/perf_event_intel.c |    1 +
 tools/perf/builtin-kmem.c              |    1 -
 2 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/perf_event_intel.c +1 -0
index 84bfde6..9c794ac 100644
@@ -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));
 
tools/perf/builtin-kmem.c +0 -1
index 7d9e3a7..924a951 100644
@@ -14,7 +14,6 @@
 #include "util/debug.h"
 
 #include <linux/rbtree.h>
-#include <linux/slab.h>
 
 struct alloc_stat;
 typedef int (*sort_fn_t)(struct alloc_stat *, struct alloc_stat *);