[PATCH] tracing: Get rid of obsolete global_start_up variable

[PATCH] tracing: Get rid of obsolete global_start_up variable

[Namhyung Kim]

It seems like it's a leftover from commit 4104d326b670 ("ftrace:
Remove global function list and call function directly").  As it
isn't updated at all, checking its value is meaningless.

Let's get rid of it.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 kernel/trace/ftrace.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index cc07b7fc4372..071908f58e7a 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2053,7 +2053,6 @@ static void ftrace_run_update_code(int command)
 
 static ftrace_func_t saved_ftrace_func;
 static int ftrace_start_up;
-static int global_start_up;
 
 static void control_ops_free(struct ftrace_ops *ops)
 {
@@ -2117,8 +2116,7 @@ static int ftrace_shutdown(struct ftrace_ops *ops, int command)
 
 	ftrace_hash_rec_disable(ops, 1);
 
-	if (!global_start_up)
-		ops->flags &= ~FTRACE_OPS_FL_ENABLED;
+	ops->flags &= ~FTRACE_OPS_FL_ENABLED;
 
 	command |= FTRACE_UPDATE_CALLS;
 
-- 
1.7.9.2

Re: [PATCH] tracing: Get rid of obsolete global_start_up variable

[Steven Rostedt]

On Thu, 12 Jun 2014 23:56:12 +0900
Namhyung Kim <namhyung@kernel.org> wrote:

> It seems like it's a leftover from commit 4104d326b670 ("ftrace:
> Remove global function list and call function directly").  As it
> isn't updated at all, checking its value is meaningless.
> 
> Let's get rid of it.

Thanks, I added this to my 3.17 queue.

-- Steve

> 
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
>  kernel/trace/ftrace.c |    4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> index cc07b7fc4372..071908f58e7a 100644
> --- a/kernel/trace/ftrace.c
> +++ b/kernel/trace/ftrace.c
> @@ -2053,7 +2053,6 @@ static void ftrace_run_update_code(int command)
>  
>  static ftrace_func_t saved_ftrace_func;
>  static int ftrace_start_up;
> -static int global_start_up;
>  
>  static void control_ops_free(struct ftrace_ops *ops)
>  {
> @@ -2117,8 +2116,7 @@ static int ftrace_shutdown(struct ftrace_ops *ops, int command)
>  
>  	ftrace_hash_rec_disable(ops, 1);
>  
> -	if (!global_start_up)
> -		ops->flags &= ~FTRACE_OPS_FL_ENABLED;
> +	ops->flags &= ~FTRACE_OPS_FL_ENABLED;
>  
>  	command |= FTRACE_UPDATE_CALLS;
>