ftrace: Have static function trace clear ENABLED flag on unregister

The ENABLED flag needs to be cleared when a ftrace_ops is unregistered
otherwise it wont be able to be registered again.

This is only for static tracing and does not affect DYNAMIC_FTRACE at
all.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index dcee546f21bc4ceed6afa6caae60275dfef45c8c..5313c1100d30602c4a5edffac6404849f8539986 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -4463,7 +4463,13 @@ static inline void ftrace_startup_enable(int command) { }
                        (ops)->flags |= FTRACE_OPS_FL_ENABLED;          \
                ___ret;                                                 \
        })
-# define ftrace_shutdown(ops, command) __unregister_ftrace_function(ops)
+# define ftrace_shutdown(ops, command)                                 \
+       ({                                                              \
+               int ___ret = __unregister_ftrace_function(ops);         \
+               if (!___ret)                                            \
+                       (ops)->flags &= ~FTRACE_OPS_FL_ENABLED;         \
+               ___ret;                                                 \
+       })
 
 # define ftrace_startup_sysctl()       do { } while (0)
 # define ftrace_shutdown_sysctl()      do { } while (0)