It has been suggested that I add a way to disable the function tracer
on an oops. This code adds a ftrace_kill_atomic. It is not meant to be
used in normal situations. It will disable the ftrace tracer, but will
not perform the nice shutdown that requires scheduling.

Signed-off-by: Steven Rostedt
---
include/linux/ftrace.h | 1 +
kernel/trace/ftrace.c | 15 +++++++++++++++
2 files changed, 16 insertions(+)

Index: linux-tip.git/include/linux/ftrace.h
================================================== =================
--- linux-tip.git.orig/include/linux/ftrace.h 2008-07-03 17:30:24.000000000 -0400
+++ linux-tip.git/include/linux/ftrace.h 2008-07-10 11:55:15.000000000 -0400
@@ -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)
{
Index: linux-tip.git/kernel/trace/ftrace.c
================================================== =================
--- linux-tip.git.orig/kernel/trace/ftrace.c 2008-07-10 00:30:00.000000000 -0400
+++ linux-tip.git/kernel/trace/ftrace.c 2008-07-10 11:54:09.000000000 -0400
@@ -1602,6 +1602,21 @@ core_initcall(ftrace_dynamic_init);
#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
*
* This is a safety measure. If something was detected that seems

--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/