diff --git a/[refs] b/[refs]
index 51aab205af43..67952cd58513 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ca530852346be239b7c19e7bec5d2b78855bebe
+refs/heads/master: 6adaad14d7d4d3ef31b4e2dc992b18b5da7c4eb3
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 2796bd2b17e4..8f89690230e6 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -797,7 +797,7 @@ void trace_find_cmdline(int pid, char comm[])
 
 void tracing_record_cmdline(struct task_struct *tsk)
 {
-	if (atomic_read(&trace_record_cmdline_disabled))
+	if (atomic_read(&trace_record_cmdline_disabled) || !tracing_is_on())
 		return;
 
 	trace_save_cmdline(tsk);