aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/Kconfig5
-rw-r--r--kernel/trace/Makefile6
-rw-r--r--kernel/trace/trace_events.c4
3 files changed, 9 insertions, 6 deletions
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 9301a0e35e0c..4cea4f41c1d9 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -62,8 +62,12 @@ config HAVE_C_RECORDMCOUNT
62config TRACER_MAX_TRACE 62config TRACER_MAX_TRACE
63 bool 63 bool
64 64
65config TRACE_CLOCK
66 bool
67
65config RING_BUFFER 68config RING_BUFFER
66 bool 69 bool
70 select TRACE_CLOCK
67 71
68config FTRACE_NMI_ENTER 72config FTRACE_NMI_ENTER
69 bool 73 bool
@@ -114,6 +118,7 @@ config TRACING
114 select NOP_TRACER 118 select NOP_TRACER
115 select BINARY_PRINTF 119 select BINARY_PRINTF
116 select EVENT_TRACING 120 select EVENT_TRACING
121 select TRACE_CLOCK
117 122
118config GENERIC_TRACER 123config GENERIC_TRACER
119 bool 124 bool
diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
index 837090808aac..d7e2068e4b71 100644
--- a/kernel/trace/Makefile
+++ b/kernel/trace/Makefile
@@ -19,11 +19,7 @@ endif
19 19
20CFLAGS_trace_events_filter.o := -I$(src) 20CFLAGS_trace_events_filter.o := -I$(src)
21 21
22# 22obj-$(CONFIG_TRACE_CLOCK) += trace_clock.o
23# Make the trace clocks available generally: it's infrastructure
24# relied on by ptrace for example:
25#
26obj-y += trace_clock.o
27 23
28obj-$(CONFIG_FUNCTION_TRACER) += libftrace.o 24obj-$(CONFIG_FUNCTION_TRACER) += libftrace.o
29obj-$(CONFIG_RING_BUFFER) += ring_buffer.o 25obj-$(CONFIG_RING_BUFFER) += ring_buffer.o
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 6825d833a257..bbb0e63d78e9 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -1646,9 +1646,11 @@ static __init void event_trace_self_tests(void)
1646 event_test_stuff(); 1646 event_test_stuff();
1647 1647
1648 ret = __ftrace_set_clr_event(NULL, system->name, NULL, 0); 1648 ret = __ftrace_set_clr_event(NULL, system->name, NULL, 0);
1649 if (WARN_ON_ONCE(ret)) 1649 if (WARN_ON_ONCE(ret)) {
1650 pr_warning("error disabling system %s\n", 1650 pr_warning("error disabling system %s\n",
1651 system->name); 1651 system->name);
1652 continue;
1653 }
1652 1654
1653 pr_cont("OK\n"); 1655 pr_cont("OK\n");
1654 } 1656 }