Merge branch 'devel' into next

[mv-sheeva.git] / kernel / trace / ftrace.c

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 1359632668a44ac8d4c5c2527a5373684d34bd4c..4231a3dc224ac1f14460f63f195f7024980545c1 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/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();
 }