diff options
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel.c | 1 | ||||
| -rw-r--r-- | tools/perf/builtin-kmem.c | 1 |
2 files changed, 1 insertions, 1 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 | ||
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c index 7d9e3a7e34d3..924a9518931a 100644 --- a/tools/perf/builtin-kmem.c +++ b/tools/perf/builtin-kmem.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include "util/debug.h" | 14 | #include "util/debug.h" |
| 15 | 15 | ||
| 16 | #include <linux/rbtree.h> | 16 | #include <linux/rbtree.h> |
| 17 | #include <linux/slab.h> | ||
| 18 | 17 | ||
| 19 | struct alloc_stat; | 18 | struct alloc_stat; |
| 20 | typedef int (*sort_fn_t)(struct alloc_stat *, struct alloc_stat *); | 19 | typedef int (*sort_fn_t)(struct alloc_stat *, struct alloc_stat *); |
