Skip to content

Commit

Permalink
ftrace: Remove boolean of hash_enable and hash_disable
Browse files Browse the repository at this point in the history
Commit 4104d32 "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: Steven Rostedt <rostedt@goodmis.org>
  • Loading branch information
Steven Rostedt (Red Hat) committed May 14, 2014
1 parent 7c65bbc commit 66209a5
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions kernel/trace/ftrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -2042,7 +2042,6 @@ static void ftrace_startup_enable(int command)

static int ftrace_startup(struct ftrace_ops *ops, int command)
{
bool hash_enable = true;
int ret;

if (unlikely(ftrace_disabled))
Expand All @@ -2056,8 +2055,8 @@ static int ftrace_startup(struct ftrace_ops *ops, int command)
command |= FTRACE_UPDATE_CALLS;

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);

Expand All @@ -2066,7 +2065,6 @@ static int ftrace_startup(struct ftrace_ops *ops, int command)

static int ftrace_shutdown(struct ftrace_ops *ops, int command)
{
bool hash_disable = true;
int ret;

if (unlikely(ftrace_disabled))
Expand All @@ -2084,8 +2082,7 @@ static int ftrace_shutdown(struct ftrace_ops *ops, int command)
*/
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)
ops->flags &= ~FTRACE_OPS_FL_ENABLED;
Expand Down

0 comments on commit 66209a5

Please sign in to comment.