Merge branch 'x86/cache' into perf/core, to resolve conflicts

Browse source

Avoid conflict with upcoming perf/core patches, merge in the RDT perf work.

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

...

This commit is contained in:

Ingo Molnar 2018-10-02 09:51:41 +02:00

parent 97e831e130 dd45407c0b

commit a4c9f26533

4 changed files with 253 additions and 160 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

22

Documentation/x86/intel_rdt_ui.txt

View file

21

arch/x86/events/core.c

View file

1

arch/x86/include/asm/perf_event.h

View file

377

arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c

View file