---

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

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26bc83f4cb911a0b4dabfe23b700aaf3235f2955
+refs/heads/master: a2bb6a3d85ef3124cd336403a95abc0540d3fbe2
diff --git a/trunk/include/linux/ftrace.h b/trunk/include/linux/ftrace.h
@@ -89,6 +89,7 @@ void ftrace_enable_daemon(void);
 
 /* totally disable ftrace - can not re-enable after this */
 void ftrace_kill(void);
+void ftrace_kill_atomic(void);
 
 static inline void tracer_disable(void)
 {

diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
@@ -1601,6 +1601,21 @@ core_initcall(ftrace_dynamic_init);
 # define ftrace_force_shutdown()	do { } while (0)
 #endif /* CONFIG_DYNAMIC_FTRACE */
 
+/**
+ * ftrace_kill_atomic - kill ftrace from critical sections
+ *
+ * This function should be used by panic code. It stops ftrace
+ * but in a not so nice way. If you need to simply kill ftrace
+ * from a non-atomic section, use ftrace_kill.
+ */
+void ftrace_kill_atomic(void)
+{
+	ftrace_disabled = 1;
+	ftrace_enabled = 0;
+	ftraced_suspend = -1;
+	clear_ftrace_function();
+}
+
 /**
  * ftrace_kill - totally shutdown ftrace
  *