diff --git a/[refs] b/[refs]
index 258674bbfead..8de29f29b6c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ac0fca4ccb355ce50471d7aa3f10f5900b28b95
+refs/heads/master: 4c1f4d4f0175129934d5dbc19a39296430937a05
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index b4b1b4fe99fd..0e4b7119e263 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -132,7 +132,7 @@ static const char *trace_options[] = {
 	NULL
 };
 
-static unsigned trace_flags = TRACE_ITER_PRINT_PARENT | TRACE_ITER_STACKTRACE;
+static unsigned trace_flags = TRACE_ITER_PRINT_PARENT;
 
 static DEFINE_SPINLOCK(ftrace_max_lock);