Merge branch 'perf-fixes-for-linus' of...
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (57 commits) x86, perf events: Check if we have APIC enabled perf_event: Fix variable initialization in other codepaths perf kmem: Fix unused argument build warning perf symbols: perf_header__read_build_ids() offset'n'size should be u64 perf symbols: dsos__read_build_ids() should read both user and kernel buildids perf tools: Align long options which have no short forms perf kmem: Show usage if no option is specified sched: Mark sched_clock() as notrace perf sched: Add max delay time snapshot perf tools: Correct size given to memset perf_event: Fix perf_swevent_hrtimer() variable initialization perf sched: Fix for getting task's execution time tracing/kprobes: Fix field creation's bad error handling perf_event: Cleanup for cpu_clock_perf_event_update() perf_event: Allocate children's perf_event_ctxp at the right time perf_event: Clean up __perf_event_init_context() hw-breakpoints: Modify breakpoints without unregistering them perf probe: Update perf-probe document perf probe: Support --del option trace-kprobe: Support delete probe syntax ...
No related branches found
No related tags found
Showing
- arch/x86/Kconfig.debug 2 additions, 2 deletionsarch/x86/Kconfig.debug
- arch/x86/kernel/cpu/perf_event.c 21 additions, 10 deletionsarch/x86/kernel/cpu/perf_event.c
- arch/x86/kernel/dumpstack_64.c 32 additions, 1 deletionarch/x86/kernel/dumpstack_64.c
- arch/x86/kernel/entry_64.S 3 additions, 3 deletionsarch/x86/kernel/entry_64.S
- arch/x86/kernel/hw_breakpoint.c 2 additions, 3 deletionsarch/x86/kernel/hw_breakpoint.c
- arch/x86/kernel/ptrace.c 33 additions, 35 deletionsarch/x86/kernel/ptrace.c
- arch/x86/lib/Makefile 2 additions, 2 deletionsarch/x86/lib/Makefile
- arch/x86/tools/test_get_len.c 1 addition, 1 deletionarch/x86/tools/test_get_len.c
- include/linux/hw_breakpoint.h 17 additions, 23 deletionsinclude/linux/hw_breakpoint.h
- include/linux/perf_event.h 20 additions, 21 deletionsinclude/linux/perf_event.h
- include/linux/sched.h 2 additions, 1 deletioninclude/linux/sched.h
- kernel/hw_breakpoint.c 88 additions, 58 deletionskernel/hw_breakpoint.c
- kernel/perf_event.c 38 additions, 37 deletionskernel/perf_event.c
- kernel/trace/trace_kprobe.c 30 additions, 11 deletionskernel/trace/trace_kprobe.c
- kernel/trace/trace_ksym.c 3 additions, 2 deletionskernel/trace/trace_ksym.c
- samples/hw_breakpoint/data_breakpoint.c 5 additions, 2 deletionssamples/hw_breakpoint/data_breakpoint.c
- tools/perf/Documentation/perf-kmem.txt 8 additions, 5 deletionstools/perf/Documentation/perf-kmem.txt
- tools/perf/Documentation/perf-probe.txt 16 additions, 5 deletionstools/perf/Documentation/perf-probe.txt
- tools/perf/builtin-buildid-list.c 1 addition, 1 deletiontools/perf/builtin-buildid-list.c
- tools/perf/builtin-kmem.c 56 additions, 67 deletionstools/perf/builtin-kmem.c
Loading
Please register or sign in to comment