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: perf trace scripting: Fix extern struct definitions perf ui hist browser: Fix segfault on 'a' for annotate perf tools: Fix build breakage perf, x86: Handle in flight NMIs on P4 platform oprofile, ARM: Release resources on failure oprofile: Add Support for Intel CPU Family 6 / Model 29
Showing
- arch/arm/oprofile/common.c 5 additions, 2 deletionsarch/arm/oprofile/common.c
- arch/x86/kernel/cpu/perf_event_p4.c 5 additions, 1 deletionarch/x86/kernel/cpu/perf_event_p4.c
- arch/x86/oprofile/nmi_int.c 1 addition, 0 deletionsarch/x86/oprofile/nmi_int.c
- tools/perf/Makefile 1 addition, 1 deletiontools/perf/Makefile
- tools/perf/util/trace-event-scripting.c 2 additions, 2 deletionstools/perf/util/trace-event-scripting.c
- tools/perf/util/ui/browsers/hists.c 1 addition, 1 deletiontools/perf/util/ui/browsers/hists.c
Loading
Please register or sign in to comment