diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/trace/Kconfig | 4 | ||||
-rw-r--r-- | kernel/trace/Makefile | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 23b96ebbf893..644606e899fa 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig | |||
@@ -48,6 +48,9 @@ config FTRACE_NMI_ENTER | |||
48 | depends on HAVE_FTRACE_NMI_ENTER | 48 | depends on HAVE_FTRACE_NMI_ENTER |
49 | default y | 49 | default y |
50 | 50 | ||
51 | config EVENT_TRACING | ||
52 | bool | ||
53 | |||
51 | config TRACING | 54 | config TRACING |
52 | bool | 55 | bool |
53 | select DEBUG_FS | 56 | select DEBUG_FS |
@@ -56,6 +59,7 @@ config TRACING | |||
56 | select TRACEPOINTS | 59 | select TRACEPOINTS |
57 | select NOP_TRACER | 60 | select NOP_TRACER |
58 | select BINARY_PRINTF | 61 | select BINARY_PRINTF |
62 | select EVENT_TRACING | ||
59 | 63 | ||
60 | # | 64 | # |
61 | # Minimum requirements an architecture has to meet for us to | 65 | # Minimum requirements an architecture has to meet for us to |
diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile index 2630f5121ec1..3ad367e7c97f 100644 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile | |||
@@ -40,11 +40,11 @@ obj-$(CONFIG_POWER_TRACER) += trace_power.o | |||
40 | obj-$(CONFIG_KMEMTRACE) += kmemtrace.o | 40 | obj-$(CONFIG_KMEMTRACE) += kmemtrace.o |
41 | obj-$(CONFIG_WORKQUEUE_TRACER) += trace_workqueue.o | 41 | obj-$(CONFIG_WORKQUEUE_TRACER) += trace_workqueue.o |
42 | obj-$(CONFIG_BLK_DEV_IO_TRACE) += blktrace.o | 42 | obj-$(CONFIG_BLK_DEV_IO_TRACE) += blktrace.o |
43 | obj-$(CONFIG_EVENT_TRACER) += trace_events.o | 43 | obj-$(CONFIG_EVENT_TRACING) += trace_events.o |
44 | obj-$(CONFIG_EVENT_TRACER) += events.o | 44 | obj-$(CONFIG_EVENT_TRACER) += events.o |
45 | obj-$(CONFIG_EVENT_TRACER) += trace_export.o | 45 | obj-$(CONFIG_EVENT_TRACING) += trace_export.o |
46 | obj-$(CONFIG_FTRACE_SYSCALLS) += trace_syscalls.o | 46 | obj-$(CONFIG_FTRACE_SYSCALLS) += trace_syscalls.o |
47 | obj-$(CONFIG_EVENT_PROFILE) += trace_event_profile.o | 47 | obj-$(CONFIG_EVENT_PROFILE) += trace_event_profile.o |
48 | obj-$(CONFIG_EVENT_TRACER) += trace_events_filter.o | 48 | obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o |
49 | 49 | ||
50 | libftrace-y := ftrace.o | 50 | libftrace-y := ftrace.o |