Steven Rostedt 6c24499f40 tracing: Fix small merge bug ...

During the 3.10 merge, a conflict happened and the resolution was
almost, but not quite, correct. An if statement was reversed.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
[ Duh. That was just silly of me  - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2013-04-30 07:23:08 -07:00

..

blktrace.c

Tracing updates for Linux 3.10

2013-04-29 13:55:38 -07:00

ftrace.c

Tracing updates for Linux 3.10

2013-04-29 13:55:38 -07:00

Kconfig

Tracing updates for Linux 3.10

2013-04-29 13:55:38 -07:00

Makefile

trace: Stop compiling in trace_clock unconditionally

2012-09-13 22:52:08 -04: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

Tracing updates for Linux 3.10

2013-04-29 13:55:38 -07: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: Fix the branch tracer that broke with buffer change

2013-03-15 00:35:54 -04: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/core improvements and fixes:

2012-08-21 11:27:00 +02: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: Move find_event_field() into trace_events.c

2013-03-15 13:22:07 -04:00

trace_events.c

tracing: Rename trace_event_mutex to trace_event_sem

2013-03-15 13:22:10 -04:00

trace_export.c

tracing: Fix some section mismatch warnings

2013-03-15 00:34:54 -04:00

trace_functions_graph.c

tracing: Consolidate max_tr into main trace_array structure

2013-03-15 00:35:40 -04:00

trace_functions.c

tracing: Add function probe to trigger stack traces

2013-03-15 00:36:05 -04:00

trace_irqsoff.c

tracing: Add function-trace option to disable function tracing of latency tracers

2013-03-15 00:36:08 -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: Use irq_work for wake ups and remove *_nowake_*() functions

2012-11-02 10:21:52 -04:00

trace_mmiotrace.c

tracing: Consolidate max_tr into main trace_array structure

2013-03-15 00:35:40 -04:00

trace_nop.c

tracing/ftrace: make nop-tracer use polling wait for events on pipe

2009-03-23 09:22:15 +01:00

trace_output.c

Tracing updates for Linux 3.10

2013-04-29 13:55:38 -07: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 percpu buffers for trace_printk()

2012-04-23 21:15:55 -04:00

trace_probe.c

tracing: Replace strict_strto* with kstrto*

2012-10-31 16:45:23 -04:00

trace_probe.h

uprobes/tracing: Introduce is_trace_uprobe_enabled()

2013-02-08 18:24:30 +01:00

trace_sched_switch.c

tracing: Consolidate max_tr into main trace_array structure

2013-03-15 00:35:40 -04:00

trace_sched_wakeup.c

tracing: Add function-trace option to disable function tracing of latency tracers

2013-03-15 00:36:08 -04: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

tracing: Fix ftrace_dump()

2013-03-15 19:24:56 -04:00

trace_stack.c

Tracing updates for Linux 3.10

2013-04-29 13:55:38 -07:00

trace_stat.c

tracing: Check return value of tracing_init_dentry()

2013-04-12 23:02:32 -04:00

trace_stat.h

tracing/stat: Add stat_release() callback

2009-07-10 12:14:05 +02:00

trace_syscalls.c

tracing: Fix comment about prefix in arch_syscall_match_sym_name()

2013-03-15 13:22:09 -04:00

trace_uprobe.c

uprobes/perf: Avoid uprobe_apply() whenever possible

2013-02-08 18:28:08 +01:00

trace.c

tracing: Fix small merge bug

2013-04-30 07:23:08 -07:00

trace.h

tracing: Move find_event_field() into trace_events.c

2013-03-15 13:22:07 -04:00