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

Browse source

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf, x86: Update/fix Intel Nehalem cache events
  perf, x86: P4 PMU - Don't forget to clear cpuc->active_mask on overflow
  x86, perf event: Turn off unstructured raw event access to offcore registers
  perf: Support Xeon E7's via the Westmere PMU driver

...

This commit is contained in:

Linus Torvalds 2011-04-22 11:31:27 -07:00

parent d6d61c97e6 f4929bd372

commit 258ba6a5a9

3 changed files with 11 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

arch/x86/kernel/cpu/perf_event.c

View file

9

arch/x86/kernel/cpu/perf_event_intel.c

View file

2

arch/x86/kernel/cpu/perf_event_p4.c

View file