Merge branch 'perf/urgent' into perf/core, to pick up fixes before applying new changes

Browse source

Signed-off-by: Ingo Molnar <mingo@kernel.org>

...

This commit is contained in:

Ingo Molnar 2015-08-12 11:39:19 +02:00

parent f1d800bf61 d7a702f0b1

commit 3d325bf0da

4 changed files with 90 additions and 38 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

23

arch/x86/kernel/cpu/perf_event_intel.c

View file

8

arch/x86/kernel/cpu/perf_event_intel_cqm.c

View file

87

kernel/events/core.c

View file

10

kernel/events/ring_buffer.c

View file