Merge branch 'perf/urgent' into perf/core, to pick up fixes

Browse source

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

...

This commit is contained in:

Ingo Molnar 2019-04-16 12:14:46 +02:00

parent 496156e364 9d5dcc93a6

commit cc8670945d

5 changed files with 58 additions and 58 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

2

arch/x86/events/intel/core.c

View file

38

arch/x86/events/perf_event.h

View file

37

kernel/events/core.c

View file

33

kernel/events/ring_buffer.c

View file

6

kernel/kprobes.c

View file