Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48de8cb7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-fixes-for-linus' of... 

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 5a0e3ad6 slab.h script
parents 63634c86 134fbadf

arch/x86/kernel/cpu/perf_event_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 *);