From 2f8ff737a77a73b49d9bacfc405a0ed418daba00 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 12 May 2008 21:20:51 +0200
Subject: [PATCH] --- yaml --- r: 100479 b: refs/heads/master c:
 4c1f4d4f0175129934d5dbc19a39296430937a05 h: refs/heads/master i:   100477:
 7d8774547fe77fd671013e6c5f9d568293e084ff   100475:
 0dfbb2fcaa2999d7ed5aa244f300f365d6b037e3   100471:
 30caf23ce258e3709b6a22c2cb34984695023930   100463:
 373352e0142996a1ef380f2ef2af4cb8252cd4e5   100447:
 961a143907d3d9f28b7d90fd6a7015e5d47ce2aa   100415:
 070ab6df378e2f6d2dc9d04551199fb422622ae5   100351:
 8a46db1dffaf095df2ccc5b3a9f89370139a46f2 v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/trace/trace.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);