diff --git a/[refs] b/[refs]
index 8a5ad708c4ca..ab2756a7456c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a54164114b96b4693b42cdb553260eec41ea4393
+refs/heads/master: 84c6cf0db6a00601eb43cfc08244a398ffb0894c
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 72b171b90e55..d62248dfda76 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -4040,8 +4040,7 @@ static ssize_t tracing_clock_write(struct file *filp, const char __user *ubuf,
 	 * Reset the buffer so that it doesn't have incomparable timestamps.
 	 */
 	tracing_reset_online_cpus(&global_trace);
-	if (max_tr.buffer)
-		tracing_reset_online_cpus(&max_tr);
+	tracing_reset_online_cpus(&max_tr);
 
 	mutex_unlock(&trace_types_lock);