---

yaml --- r: 100651 b: refs/heads/master c: b2613e3 h: refs/heads/master i: 100649: 5583dc3 100647: c6f2142 v: v3
git-mirror · Jul 11, 2008 · cd667e1 · cd667e1
1 parent 8e266d6
commit cd667e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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();
 }