aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-11-17 17:58:01 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-17 17:58:01 -0500
commit2dcd9c71c1ffa9a036e09047f60e08383bb0abb6 (patch)
tree8caabaf493288a3d5adb46ac49ad5097d0c907c7 /kernel/trace/trace.h
parentb1c2a344cc19b40d2f1e7cbd9c2f4f205ae6d650 (diff)
parenta96a5037ed0f52e2d86739f4a1ef985bd036e575 (diff)
Merge tag 'trace-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing updates from - allow module init functions to be traced - clean up some unused or not used by config events (saves space) - clean up of trace histogram code - add support for preempt and interrupt enabled/disable events - other various clean ups * tag 'trace-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (30 commits) tracing, thermal: Hide cpu cooling trace events when not in use tracing, thermal: Hide devfreq trace events when not in use ftrace: Kill FTRACE_OPS_FL_PER_CPU perf/ftrace: Small cleanup perf/ftrace: Fix function trace events perf/ftrace: Revert ("perf/ftrace: Fix double traces of perf on ftrace:function") tracing, dma-buf: Remove unused trace event dma_fence_annotate_wait_on tracing, memcg, vmscan: Hide trace events when not in use tracing/xen: Hide events that are not used when X86_PAE is not defined tracing: mark trace_test_buffer as __maybe_unused printk: Remove superfluous memory barriers from printk_safe ftrace: Clear hashes of stale ips of init memory tracing: Add support for preempt and irq enable/disable events tracing: Prepare to add preempt and irq trace events ftrace/kallsyms: Have /proc/kallsyms show saved mod init functions ftrace: Add freeing algorithm to free ftrace_mod_maps ftrace: Save module init functions kallsyms symbols for tracing ftrace: Allow module init functions to be traced ftrace: Add a ftrace_free_mem() function for modules to use tracing: Reimplement log2 ...
Diffstat (limited to 'kernel/trace/trace.h')
-rw-r--r--kernel/trace/trace.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 6b0b343a36a2..2a6d0325a761 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -739,8 +739,6 @@ extern int trace_selftest_startup_wakeup(struct tracer *trace,
739 struct trace_array *tr); 739 struct trace_array *tr);
740extern int trace_selftest_startup_nop(struct tracer *trace, 740extern int trace_selftest_startup_nop(struct tracer *trace,
741 struct trace_array *tr); 741 struct trace_array *tr);
742extern int trace_selftest_startup_sched_switch(struct tracer *trace,
743 struct trace_array *tr);
744extern int trace_selftest_startup_branch(struct tracer *trace, 742extern int trace_selftest_startup_branch(struct tracer *trace,
745 struct trace_array *tr); 743 struct trace_array *tr);
746/* 744/*
@@ -1755,6 +1753,13 @@ void trace_printk_start_comm(void);
1755int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set); 1753int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
1756int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled); 1754int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
1757 1755
1756#define MAX_EVENT_NAME_LEN 64
1757
1758extern int trace_run_command(const char *buf, int (*createfn)(int, char**));
1759extern ssize_t trace_parse_run_command(struct file *file,
1760 const char __user *buffer, size_t count, loff_t *ppos,
1761 int (*createfn)(int, char**));
1762
1758/* 1763/*
1759 * Normal trace_printk() and friends allocates special buffers 1764 * Normal trace_printk() and friends allocates special buffers
1760 * to do the manipulation, as well as saves the print formats 1765 * to do the manipulation, as well as saves the print formats