diff options
author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-05-06 21:57:49 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2014-05-14 11:37:25 -0400 |
commit | 66209a5bd4825e8890bfb65d48efa8a47c647fea (patch) | |
tree | af341436b09b04b83e33477b9d4197c5b0d718e6 /kernel/trace | |
parent | 7c65bbc7dcface00b295bbd18bce82fe1db3d633 (diff) |
ftrace: Remove boolean of hash_enable and hash_disable
Commit 4104d326b670 "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>
Diffstat (limited to 'kernel/trace')
-rw-r--r-- | kernel/trace/ftrace.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 38e5cf73b9ae..2c99d1f7caf1 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c | |||
@@ -2042,7 +2042,6 @@ static void ftrace_startup_enable(int command) | |||
2042 | 2042 | ||
2043 | static int ftrace_startup(struct ftrace_ops *ops, int command) | 2043 | static int ftrace_startup(struct ftrace_ops *ops, int command) |
2044 | { | 2044 | { |
2045 | bool hash_enable = true; | ||
2046 | int ret; | 2045 | int ret; |
2047 | 2046 | ||
2048 | if (unlikely(ftrace_disabled)) | 2047 | if (unlikely(ftrace_disabled)) |
@@ -2056,8 +2055,8 @@ static int ftrace_startup(struct ftrace_ops *ops, int command) | |||
2056 | command |= FTRACE_UPDATE_CALLS; | 2055 | command |= FTRACE_UPDATE_CALLS; |
2057 | 2056 | ||
2058 | ops->flags |= FTRACE_OPS_FL_ENABLED; | 2057 | ops->flags |= FTRACE_OPS_FL_ENABLED; |
2059 | if (hash_enable) | 2058 | |
2060 | ftrace_hash_rec_enable(ops, 1); | 2059 | ftrace_hash_rec_enable(ops, 1); |
2061 | 2060 | ||
2062 | ftrace_startup_enable(command); | 2061 | ftrace_startup_enable(command); |
2063 | 2062 | ||
@@ -2066,7 +2065,6 @@ static int ftrace_startup(struct ftrace_ops *ops, int command) | |||
2066 | 2065 | ||
2067 | static int ftrace_shutdown(struct ftrace_ops *ops, int command) | 2066 | static int ftrace_shutdown(struct ftrace_ops *ops, int command) |
2068 | { | 2067 | { |
2069 | bool hash_disable = true; | ||
2070 | int ret; | 2068 | int ret; |
2071 | 2069 | ||
2072 | if (unlikely(ftrace_disabled)) | 2070 | if (unlikely(ftrace_disabled)) |
@@ -2084,8 +2082,7 @@ static int ftrace_shutdown(struct ftrace_ops *ops, int command) | |||
2084 | */ | 2082 | */ |
2085 | WARN_ON_ONCE(ftrace_start_up < 0); | 2083 | WARN_ON_ONCE(ftrace_start_up < 0); |
2086 | 2084 | ||
2087 | if (hash_disable) | 2085 | ftrace_hash_rec_disable(ops, 1); |
2088 | ftrace_hash_rec_disable(ops, 1); | ||
2089 | 2086 | ||
2090 | if (!global_start_up) | 2087 | if (!global_start_up) |
2091 | ops->flags &= ~FTRACE_OPS_FL_ENABLED; | 2088 | ops->flags &= ~FTRACE_OPS_FL_ENABLED; |