Linus Torvalds ba635f8cd2 The first two patches fix the debugfs README file to reflect better ... the new features added to 3.14. The third patch is a minor bugfix to the trace_puts() functions that will crash the system if a developer adds one before the tracing system is setup. It also affects trace_printk() if it has no arguments, as the code will convert it to a trace_puts() as well. Note, this bug will not affect unmodified kernels, as trace_printk() and trace_puts() should only be used by developers for testing. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) iQEcBAABAgAGBQJS5oAkAAoJEKQekfcNnQGuOfkH/1ScwoRslERCCjhPEZu958bG VugNvliB/uDwq3qkmBcncMHwqkFBgJay9ieah+JFeK6x3G6mO/uf+UhN5cmLzVBh vA5dKR2zW6WTxKYSvXYapD7OzC7R+V6CLvpMl5WMZ1t3ESQhR6gUrpPdigecBWs9 015rMVA2xXjNnHNDM1nem1PhnMba78A/N98lFErYGpvVBjkCpB8mSt8adds9bYp8 a83P6tGUfXvsYO3sOqqBnOOqcfzCjjJbmr94v/F+SmLyuxuV0tVzBkIwXkKTNhEK bQZj9Pfe+1oIkldXxstn5jWaOvI6RlAGW4b4qXt30AgrGRSyEo5xpvfLfyNUif4= =N3kq -----END PGP SIGNATURE----- Merge tag 'trace-fixes-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace Pull tracing fixes from Steven Rostedt: "The first two patches fix the debugfs README file to reflect better the new features added to 3.14. The third patch is a minor bugfix to the trace_puts() functions that will crash the system if a developer adds one before the tracing system is setup. It also affects trace_printk() if it has no arguments, as the code will convert it to a trace_puts() as well. Note, this bug will not affect unmodified kernels, as trace_printk() and trace_puts() should only be used by developers for testing" * tag 'trace-fixes-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing: Check if tracing is enabled in trace_puts() tracing: Fix formatting of trace README file tracing/README: Add event file usage to tracing mini-HOWTO		2014-01-27 08:22:30 -08:00
..
blktrace.c	kernel: trace: blktrace: remove redundent memcpy() in compat_blk_trace_setup()	2013-11-08 09:04:30 -07:00
ftrace.c	This pull request has a new feature to ftrace, namely the trace event	2014-01-22 16:35:21 -08:00
Kconfig	ring-buffer: Select IRQ_WORK	2013-05-03 19:24:17 -04:00
Makefile	tracing: Add basic event trigger framework	2013-12-20 18:40:22 -05:00
power-traces.c	PM / tracing: remove deprecated power trace API	2013-01-26 00:39:12 +01:00
ring_buffer_benchmark.c	tracing: Use NUMA allocation for per-cpu ring buffer pages	2011-06-14 22:04:39 -04:00
ring_buffer.c	sched/clock, x86: Use a static_key for sched_clock_stable	2014-01-13 15:13:13 +01:00
rpm-traces.c	PM / Runtime: Introduce trace points for tracing rpm_* functions	2011-09-27 22:53:27 +02:00
trace_branch.c	tracing: Update event filters for multibuffer	2013-11-05 16:50:20 -05:00
trace_clock.c	tracing: Add "uptime" trace clock that uses jiffies	2013-03-15 00:36:09 -04:00
trace_entries.h	tracing: Add trace_puts() for even faster trace_printk() tracing	2013-03-15 00:35:55 -04:00
trace_event_perf.c	perf/trace: Properly use u64 to hold event_id	2013-11-19 16:57:44 +01:00
trace_events_filter_test.h	tracing/filter: Add startup tests for events filter	2011-08-19 14:35:59 -04:00
trace_events_filter.c	tracing: Add and use generic set_trigger_filter() implementation	2013-12-21 22:02:17 -05:00
trace_events_trigger.c	tracing: Show available event triggers when no trigger is set	2014-01-09 21:20:32 -05:00
trace_events.c	tracing: Move ftrace_event_file() out of DYNAMIC_FTRACE ifdef	2013-12-21 22:02:17 -05:00
trace_export.c	tracing: Update event filters for multibuffer	2013-11-05 16:50:20 -05:00
trace_functions_graph.c	tracing: Do not use signed enums with unsigned long long in fgragh output	2013-11-06 15:26:56 -05:00
trace_functions.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	tracing: Consolidate max_tr into main trace_array structure	2013-03-15 00:35:40 -04:00
trace_kprobe.c	tracing: Consolidate event trigger code	2014-01-09 21:20:07 -05:00
trace_mmiotrace.c	tracing: Update event filters for multibuffer	2013-11-05 16:50:20 -05:00
trace_nop.c
trace_output.c	ftrace, sched: Add TRACE_FLAG_PREEMPT_RESCHED	2013-11-11 12:43:39 +01:00
trace_output.h	tracing: Rename trace_event_mutex to trace_event_sem	2013-03-15 13:22:10 -04:00
trace_printk.c	tracing: Add __tracepoint_string() to export string pointers	2013-07-26 13:39:44 -04:00
trace_probe.c	tracing/uprobes: Add @+file_offset fetch method	2014-01-02 20:57:05 -05:00
trace_probe.h	tracing/probes: Fix build break on !CONFIG_KPROBE_EVENT	2014-01-03 15:27:18 -05:00
trace_sched_switch.c	tracing: Update event filters for multibuffer	2013-11-05 16:50:20 -05:00
trace_sched_wakeup.c	sched/deadline: Add SCHED_DEADLINE inheritance logic	2014-01-13 13:42:56 +01:00
trace_selftest_dynamic.c	ftrace: Add self-tests for multiple function trace users	2011-05-18 19:24:51 -04:00
trace_selftest.c	sched/deadline: Add latency tracing for SCHED_DEADLINE tasks	2014-01-13 13:41:11 +01:00
trace_stack.c	tracing: Add generic tracing_lseek() function	2014-01-02 16:17:12 -05:00
trace_stat.c	trace/trace_stat: use rbtree postorder iteration helper instead of opencoding	2013-11-05 16:01:47 -05:00
trace_stat.h
trace_syscalls.c	tracing: Consolidate event trigger code	2014-01-09 21:20:07 -05:00
trace_uprobe.c	tracing/probes: Fix build break on !CONFIG_KPROBE_EVENT	2014-01-03 15:27:18 -05:00
trace.c	tracing: Check if tracing is enabled in trace_puts()	2014-01-23 12:27:59 -05:00
trace.h	tracing: Fix rcu handling of event_trigger_data filter field	2014-01-02 16:17:22 -05:00