Merge branch 'perf/urgent' into perf/core

Browse source

Conflicts:
	arch/x86/kernel/apic/hw_nmi.c

Merge reason: Resolve conflict, queue up dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

...

This commit is contained in:

Ingo Molnar 2010-11-26 15:07:02 +01:00

parent e4e91ac410 ee6dcfa40a

commit 6c869e772c

12 changed files with 144 additions and 46 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/Kconfig

View file

7

arch/x86/kernel/apic/hw_nmi.c

View file

20

arch/x86/kernel/cpu/perf_event.c

View file

2

arch/x86/kernel/entry_64.S

View file

4

arch/x86/kernel/hw_breakpoint.c

View file

4

include/linux/hw_breakpoint.h

View file

30

include/linux/perf_event.h

View file

3

kernel/hw_breakpoint.c

View file

4

kernel/irq_work.c

View file

93

kernel/perf_event.c

View file

17

tools/perf/builtin-record.c

View file

4

tools/perf/util/symbol.c

View file