Commit 66209a5b authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt

ftrace: Remove boolean of hash_enable and hash_disable

Commit 4104d326 "ftrace: Remove global function list and call
function directly" cleaned up the global_ops filtering and made
the code simpler, but it left a variable "hash_enable" that was used
to know if the hash functions should be updated or not. It was
updated if the global_ops did not override them. As the global_ops
are now no different than any other ftrace_ops, the hash always
gets updated and there's no reason to use the hash_enable boolean.

The same goes for hash_disable used in ftrace_shutdown().
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 7c65bbc7
...@@ -2042,7 +2042,6 @@ static void ftrace_startup_enable(int command) ...@@ -2042,7 +2042,6 @@ static void ftrace_startup_enable(int command)
static int ftrace_startup(struct ftrace_ops *ops, int command) static int ftrace_startup(struct ftrace_ops *ops, int command)
{ {
bool hash_enable = true;
int ret; int ret;
if (unlikely(ftrace_disabled)) if (unlikely(ftrace_disabled))
...@@ -2056,8 +2055,8 @@ static int ftrace_startup(struct ftrace_ops *ops, int command) ...@@ -2056,8 +2055,8 @@ static int ftrace_startup(struct ftrace_ops *ops, int command)
command |= FTRACE_UPDATE_CALLS; command |= FTRACE_UPDATE_CALLS;
ops->flags |= FTRACE_OPS_FL_ENABLED; ops->flags |= FTRACE_OPS_FL_ENABLED;
if (hash_enable)
ftrace_hash_rec_enable(ops, 1); ftrace_hash_rec_enable(ops, 1);
ftrace_startup_enable(command); ftrace_startup_enable(command);
...@@ -2066,7 +2065,6 @@ static int ftrace_startup(struct ftrace_ops *ops, int command) ...@@ -2066,7 +2065,6 @@ static int ftrace_startup(struct ftrace_ops *ops, int command)
static int ftrace_shutdown(struct ftrace_ops *ops, int command) static int ftrace_shutdown(struct ftrace_ops *ops, int command)
{ {
bool hash_disable = true;
int ret; int ret;
if (unlikely(ftrace_disabled)) if (unlikely(ftrace_disabled))
...@@ -2084,8 +2082,7 @@ static int ftrace_shutdown(struct ftrace_ops *ops, int command) ...@@ -2084,8 +2082,7 @@ static int ftrace_shutdown(struct ftrace_ops *ops, int command)
*/ */
WARN_ON_ONCE(ftrace_start_up < 0); WARN_ON_ONCE(ftrace_start_up < 0);
if (hash_disable) ftrace_hash_rec_disable(ops, 1);
ftrace_hash_rec_disable(ops, 1);
if (!global_start_up) if (!global_start_up)
ops->flags &= ~FTRACE_OPS_FL_ENABLED; ops->flags &= ~FTRACE_OPS_FL_ENABLED;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment