2 files changed, 13 insertions, 2 deletions

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index f61be3015783..a508b9d2adb8 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -49,6 +49,11 @@ config FTRACE_NMI_ENTER
        default y
 
 config EVENT_TRACING
+        select CONTEXT_SWITCH_TRACER
+        bool
+
+config CONTEXT_SWITCH_TRACER
+        select MARKERS
         bool
 
 config TRACING
@@ -176,10 +181,10 @@ config SCHED_TRACER
           This tracer tracks the latency of the highest priority task
           to be scheduled in, starting from the point it has woken up.
 
-config CONTEXT_SWITCH_TRACER
+config ENABLE_CONTEXT_SWITCH_TRACER
         bool "Trace process context switches"
         select TRACING
-        select MARKERS
+        select CONTEXT_SWITCH_TRACER
         help
           This tracer gets called from the context switch and records
           all switching of tasks.
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 9e91c4ad7c8b..9b246eb01d5f 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -85,6 +85,7 @@ static void ftrace_clear_events(void)
 
                 if (call->enabled) {
                         call->enabled = 0;
+                        tracing_stop_cmdline_record();
                         call->unregfunc();
                 }
         }
@@ -99,12 +100,14 @@ static void ftrace_event_enable_disable(struct ftrace_event_call *call,
         case 0:
                 if (call->enabled) {
                         call->enabled = 0;
+                        tracing_stop_cmdline_record();
                         call->unregfunc();
                 }
                 break;
         case 1:
                 if (!call->enabled) {
                         call->enabled = 1;
+                        tracing_start_cmdline_record();
                         call->regfunc();
                 }
                 break;
@@ -1058,6 +1061,7 @@ static void trace_module_remove_events(struct module *mod)
                         found = true;
                         if (call->enabled) {
                                 call->enabled = 0;
+                                tracing_stop_cmdline_record();
                                 call->unregfunc();
                         }
                         if (call->event)
@@ -1262,11 +1266,13 @@ static __init void event_trace_self_tests(void)
                 }
 
                 call->enabled = 1;
+                tracing_start_cmdline_record();
                 call->regfunc();
 
                 event_test_stuff();
 
                 call->unregfunc();
+                tracing_stop_cmdline_record();
                 call->enabled = 0;
 
                 pr_cont("OK\n");