Linus Torvalds 7115e3fcf4 Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip ... * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (121 commits) perf symbols: Increase symbol KSYM_NAME_LEN size perf hists browser: Refuse 'a' hotkey on non symbolic views perf ui browser: Use libslang to read keys perf tools: Fix tracing info recording perf hists browser: Elide DSO column when it is set to just one DSO, ditto for threads perf hists: Don't consider filtered entries when calculating column widths perf hists: Don't decay total_period for filtered entries perf hists browser: Honour symbol_conf.show_{nr_samples,total_period} perf hists browser: Do not exit on tab key with single event perf annotate browser: Don't change selection line when returning from callq perf tools: handle endianness of feature bitmap perf tools: Add prelink suggestion to dso update message perf script: Fix unknown feature comment perf hists browser: Apply the dso and thread filters when merging new batches perf hists: Move the dso and thread filters from hist_browser perf ui browser: Honour the xterm colors perf top tui: Give color hints just on the percentage, like on --stdio perf ui browser: Make the colors configurable and change the defaults perf tui: Remove unneeded call to newtCls on startup perf hists: Don't format the percentage on hist_entry__snprintf ... Fix up conflicts in arch/x86/kernel/kprobes.c manually. Ingo's tree did the insane "add volatile to const array", which just doesn't make sense ("volatile const"?). But we could remove the const *and* make the array volatile to make doubly sure that gcc doesn't optimize it away.. Also fix up kernel/trace/ring_buffer.c non-data-conflicts manually: the reader_lock has been turned into a raw lock by the core locking merge, and there was a new user of it introduced in this perf core merge. Make sure that new use also uses the raw accessor functions.		2011-10-26 17:03:38 +02:00
..
backtrace.c	x86, perf: Make copy_from_user_nmi() a library function	2011-07-21 20:41:57 +02:00
init.c	x86: coding style fixes to arch/x86/oprofile/init.c	2008-04-17 17:40:49 +02:00
Makefile	x86/oprofile: reanaming op_model_athlon.c to op_model_amd.c	2008-07-26 11:48:14 +02:00
nmi_int.c	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:03:38 +02:00
nmi_timer_int.c	x86, nmi: Wire up NMI handlers to new routines	2011-10-10 06:56:57 +02:00
op_counter.h	oprofile, x86: Allow setting EDGE/INV/CMASK for counter events	2011-03-24 18:45:44 +01:00
op_model_amd.c	perf, x86: Implement IBS initialization	2011-10-10 06:57:16 +02:00
op_model_p4.c	Kill off warning: ‘inline’ is not at beginning of declaration	2011-01-19 15:43:08 +01:00
op_model_ppro.c	oprofile, x86: Fix overflow and warning (commit 1d12d35)	2011-08-16 23:51:00 +02:00
op_x86_model.h	perf, x86: Implement IBS initialization	2011-10-10 06:57:16 +02:00