Merge branch 'perf-core-for-linus' of...
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (61 commits) tracing: Add __used annotation to event variable perf, trace: Fix !x86 build bug perf report: Support multiple events on the TUI perf annotate: Fix up usage of the build id cache x86/mmiotrace: Remove redundant instruction prefix checks perf annotate: Add TUI interface perf tui: Remove annotate from popup menu after failure perf report: Don't start the TUI if -D is used perf: Fix getline undeclared perf: Optimize perf_tp_event_match() perf: Remove more code from the fastpath perf: Optimize the !vmalloc backed buffer perf: Optimize perf_output_copy() perf: Fix wakeup storm for RO mmap()s perf-record: Share per-cpu buffers perf-record: Remove -M perf: Ensure that IOC_OUTPUT isn't used to create multi-writer buffers perf, trace: Optimize tracepoints by using per-tracepoint-per-cpu hlist to track events perf, trace: Optimize tracepoints by removing IRQ-disable from perf/tracepoint interaction perf tui: Allow disabling the TUI on a per command basis in ~/.perfconfig ...
Showing
- arch/sparc/kernel/perf_event.c 61 additions, 47 deletionsarch/sparc/kernel/perf_event.c
- arch/x86/include/asm/perf_event_p4.h 2 additions, 1 deletionarch/x86/include/asm/perf_event_p4.h
- arch/x86/kernel/cpu/perf_event.c 5 additions, 1 deletionarch/x86/kernel/cpu/perf_event.c
- arch/x86/kernel/cpu/perf_event_p4.c 21 additions, 20 deletionsarch/x86/kernel/cpu/perf_event_p4.c
- arch/x86/mm/pf_in.c 1 addition, 1 deletionarch/x86/mm/pf_in.c
- include/linux/ftrace_event.h 75 additions, 28 deletionsinclude/linux/ftrace_event.h
- include/linux/perf_event.h 15 additions, 13 deletionsinclude/linux/perf_event.h
- include/linux/syscalls.h 17 additions, 40 deletionsinclude/linux/syscalls.h
- include/linux/tracepoint.h 76 additions, 22 deletionsinclude/linux/tracepoint.h
- include/trace/ftrace.h 91 additions, 158 deletionsinclude/trace/ftrace.h
- include/trace/syscall.h 6 additions, 4 deletionsinclude/trace/syscall.h
- kernel/perf_event.c 217 additions, 172 deletionskernel/perf_event.c
- kernel/trace/blktrace.c 79 additions, 59 deletionskernel/trace/blktrace.c
- kernel/trace/ftrace.c 4 additions, 3 deletionskernel/trace/ftrace.c
- kernel/trace/kmemtrace.c 44 additions, 26 deletionskernel/trace/kmemtrace.c
- kernel/trace/trace.c 5 additions, 4 deletionskernel/trace/trace.c
- kernel/trace/trace.h 6 additions, 3 deletionskernel/trace/trace.h
- kernel/trace/trace_branch.c 6 additions, 2 deletionskernel/trace/trace_branch.c
- kernel/trace/trace_event_perf.c 97 additions, 88 deletionskernel/trace/trace_event_perf.c
- kernel/trace/trace_events.c 88 additions, 51 deletionskernel/trace/trace_events.c
Loading
Please register or sign in to comment