aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r--kernel/trace/trace.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index d1ef43999d9e..c0e9c1263393 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -48,7 +48,7 @@ unsigned long __read_mostly tracing_thresh;
48 * We need to change this state when a selftest is running. 48 * We need to change this state when a selftest is running.
49 * A selftest will lurk into the ring-buffer to count the 49 * A selftest will lurk into the ring-buffer to count the
50 * entries inserted during the selftest although some concurrent 50 * entries inserted during the selftest although some concurrent
51 * insertions into the ring-buffer such as ftrace_printk could occurred 51 * insertions into the ring-buffer such as trace_printk could occurred
52 * at the same time, giving false positive or negative results. 52 * at the same time, giving false positive or negative results.
53 */ 53 */
54static bool __read_mostly tracing_selftest_running; 54static bool __read_mostly tracing_selftest_running;
@@ -291,7 +291,7 @@ static const char *trace_options[] = {
291 "block", 291 "block",
292 "stacktrace", 292 "stacktrace",
293 "sched-tree", 293 "sched-tree",
294 "ftrace_printk", 294 "trace_printk",
295 "ftrace_preempt", 295 "ftrace_preempt",
296 "branch", 296 "branch",
297 "annotate", 297 "annotate",
@@ -3768,7 +3768,7 @@ int trace_vprintk(unsigned long ip, int depth, const char *fmt, va_list args)
3768} 3768}
3769EXPORT_SYMBOL_GPL(trace_vprintk); 3769EXPORT_SYMBOL_GPL(trace_vprintk);
3770 3770
3771int __ftrace_printk(unsigned long ip, const char *fmt, ...) 3771int __trace_printk(unsigned long ip, const char *fmt, ...)
3772{ 3772{
3773 int ret; 3773 int ret;
3774 va_list ap; 3774 va_list ap;
@@ -3781,7 +3781,7 @@ int __ftrace_printk(unsigned long ip, const char *fmt, ...)
3781 va_end(ap); 3781 va_end(ap);
3782 return ret; 3782 return ret;
3783} 3783}
3784EXPORT_SYMBOL_GPL(__ftrace_printk); 3784EXPORT_SYMBOL_GPL(__trace_printk);
3785 3785
3786int __ftrace_vprintk(unsigned long ip, const char *fmt, va_list ap) 3786int __ftrace_vprintk(unsigned long ip, const char *fmt, va_list ap)
3787{ 3787{