From cd667e15dccc8d405a0a97ddaea3a413d07cf7b3 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 11 Jul 2008 16:44:27 +0200
Subject: [PATCH] --- yaml --- r: 100651 b: refs/heads/master c:
 b2613e370dbeb69edbff989382fa54f2395aa471 h: refs/heads/master i:   100649:
 5583dc3869f5658d205840a0d076e40b48b590cd   100647:
 c6f21427df37cb33ebb4fdfa229a9493f4540c12 v: v3

---
 [refs]                      | 2 +-
 trunk/kernel/trace/ftrace.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2fbd5447a5a5..f887078b3f71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60bc080090e3bf6afa29c62cb25f913706551010
+refs/heads/master: b2613e370dbeb69edbff989382fa54f2395aa471
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
index 1359632668a4..4231a3dc224a 100644
--- a/trunk/kernel/trace/ftrace.c
+++ b/trunk/kernel/trace/ftrace.c
@@ -1612,7 +1612,9 @@ void ftrace_kill_atomic(void)
 {
 	ftrace_disabled = 1;
 	ftrace_enabled = 0;
+#ifdef CONFIG_DYNAMIC_FTRACE
 	ftraced_suspend = -1;
+#endif
 	clear_ftrace_function();
 }