Linus Torvalds 7eb69529cb Not much changes for the 3.12 merge window. The major tracing changes ... are still in flux, and will have to wait for 3.13. The changes for 3.12 are mostly clean ups and minor fixes. H. Peter Anvin added a check to x86_32 static function tracing that helps a small segment of the kernel community. Oleg Nesterov had a few changes from 3.11, but were mostly clean ups and not worth pushing in the -rc time frame. Li Zefan had small clean up with annotating a raw_init with __init. I fixed a slight race in updating function callbacks, but the race is so small and the bug that happens when it occurs is so minor it's not even worth pushing to stable. The only real enhancement is from Alexander Z Lam that made the tracing_cpumask work for trace buffer instances, instead of them all sharing a global cpumask. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQEcBAABAgAGBQJSLJm1AAoJEOdOSU1xswtMSu0H/0/Uuh0D5VhANZRcTATY4gUO n3WH6sm3atOxH+cbeYQcFXxOcvRcR2n90tvCMpiFlPiC0NiNR1yjro3VLS4zWb77 twq7gABdJf+Tdq7sOBmSzmY5vRKQVHIXvAfC27mBez38nCWZz0BjJGEsPBwoly25 ZaiCbKlusw/QKIEy40tuKUL/rXF6yEWnQrMujhBbyNm0w7sJVdfnd+HHmCvy15H2 IQE1g83d/dAMBjFY2BYg77J+oV6qmJxql2itvDivQWXHqFb52Jw3ZTwHwWLZlPYU AZcHtYGs2lSUscQLF56LejB7zZyE8taUufExFEVexXxZS5u7nNPXsPrA2LOOK70= =JWO6 -----END PGP SIGNATURE----- Merge tag 'trace-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace Pull tracing updates from Steven Rostedt: "Not much changes for the 3.12 merge window. The major tracing changes are still in flux, and will have to wait for 3.13. The changes for 3.12 are mostly clean ups and minor fixes. H Peter Anvin added a check to x86_32 static function tracing that helps a small segment of the kernel community. Oleg Nesterov had a few changes from 3.11, but were mostly clean ups and not worth pushing in the -rc time frame. Li Zefan had small clean up with annotating a raw_init with __init. I fixed a slight race in updating function callbacks, but the race is so small and the bug that happens when it occurs is so minor it's not even worth pushing to stable. The only real enhancement is from Alexander Z Lam that made the tracing_cpumask work for trace buffer instances, instead of them all sharing a global cpumask" * tag 'trace-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: ftrace/rcu: Do not trace debug_lockdep_rcu_enabled() x86-32, ftrace: Fix static ftrace when early microcode is enabled ftrace: Fix a slight race in modifying what function callback gets traced tracing: Make tracing_cpumask available for all instances tracing: Kill the !CONFIG_MODULES code in trace_events.c tracing: Don't pass file_operations array to event_create_dir() tracing: Kill trace_create_file_ops() and friends tracing/syscalls: Annotate raw_init function with __init		2013-09-09 14:42:15 -07:00
..
blktrace.c
ftrace.c	ftrace: Fix a slight race in modifying what function callback gets traced	2013-09-03 19:36:26 -04:00
Kconfig
Makefile
power-traces.c
ring_buffer.c	tracing: Typo fix on ring buffer comments	2013-07-18 21:31:26 -04:00
ring_buffer_benchmark.c
rpm-traces.c
trace.c	tracing: Make tracing_cpumask available for all instances	2013-08-22 12:45:24 -04:00
trace.h	Not much changes for the 3.12 merge window. The major tracing changes	2013-09-09 14:42:15 -07:00
trace_branch.c
trace_clock.c
trace_entries.h
trace_event_perf.c	tracing/perf: Move the PERF_MAX_TRACE_SIZE check into perf_trace_buf_prepare()	2013-07-18 21:31:28 -04:00
trace_events.c	tracing: Kill the !CONFIG_MODULES code in trace_events.c	2013-08-21 23:28:03 -04:00
trace_events_filter.c	tracing: Change event_filter_read/write to verify i_private != NULL	2013-07-29 22:56:59 -04:00
trace_events_filter_test.h
trace_export.c
trace_functions.c	tracing: Add ref_data to function and fgraph tracer structs	2013-07-18 21:31:31 -04:00
trace_functions_graph.c	tracing: Add ref_data to function and fgraph tracer structs	2013-07-18 21:31:31 -04:00
trace_irqsoff.c	tracing: Use flag buffer_disabled for irqsoff tracer	2013-07-01 20:34:28 -04:00
trace_kdb.c
trace_kprobe.c	tracing/kprobes: Fail to unregister if probe event files are in use	2013-07-31 22:25:46 -04:00
trace_mmiotrace.c	tracing: Use trace_seq_puts()/trace_seq_putc() where possible	2013-07-18 21:30:36 -04:00
trace_nop.c
trace_output.c	tracing: Use trace_seq_puts()/trace_seq_putc() where possible	2013-07-18 21:30:36 -04:00
trace_output.h
trace_printk.c	tracing: Add __tracepoint_string() to export string pointers	2013-07-26 13:39:44 -04:00
trace_probe.c
trace_probe.h
trace_sched_switch.c
trace_sched_wakeup.c
trace_selftest.c	ftrace: Do not run selftest if command line parameter is set	2013-07-01 20:57:15 -04:00
trace_selftest_dynamic.c
trace_stack.c
trace_stat.c
trace_stat.h
trace_syscalls.c	tracing/syscalls: Annotate raw_init function with __init	2013-08-21 22:24:52 -04:00
trace_uprobe.c	tracing/uprobes: Fail to unregister if probe event files are in use	2013-08-01 18:25:50 -04:00