Re: [PATCH v3 09/12] tracing: remove ftrace(...) function

[Steven Rostedt]

On Wed, 2013-04-10 at 11:26 +0800, zhangwei(Jovi) wrote:
> From: "zhangwei(Jovi)" <jovi.zhangwei@xxxxxxxxxx>
> 
> The only caller of function ftrace(...) was removed at long time ago,
> so remove the function body also.

Looks reasonable, pulled.

Thanks,

-- Steve

> 
> Signed-off-by: zhangwei(Jovi) <jovi.zhangwei@xxxxxxxxxx>
> ---
>  kernel/trace/trace.c |    9 ---------
>  kernel/trace/trace.h |    5 -----
>  2 files changed, 14 deletions(-)
> 
> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> index 224b152..dd0c122 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -1534,15 +1534,6 @@ trace_function(struct trace_array *tr,
>  		__buffer_unlock_commit(buffer, event);
>  }
>  
> -void
> -ftrace(struct trace_array *tr, struct trace_array_cpu *data,
> -       unsigned long ip, unsigned long parent_ip, unsigned long flags,
> -       int pc)
> -{
> -	if (likely(!atomic_read(&data->disabled)))
> -		trace_function(tr, ip, parent_ip, flags, pc);
> -}
> -
>  #ifdef CONFIG_STACKTRACE
>  
>  #define FTRACE_STACK_MAX_ENTRIES (PAGE_SIZE / sizeof(unsigned long))
> diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
> index 9964695..bb3fd1b 100644
> --- a/kernel/trace/trace.h
> +++ b/kernel/trace/trace.h
> @@ -445,11 +445,6 @@ void tracing_iter_reset(struct trace_iterator *iter, int cpu);
>  
>  void poll_wait_pipe(struct trace_iterator *iter);
>  
> -void ftrace(struct trace_array *tr,
> -			    struct trace_array_cpu *data,
> -			    unsigned long ip,
> -			    unsigned long parent_ip,
> -			    unsigned long flags, int pc);
>  void tracing_sched_switch_trace(struct trace_array *tr,
>  				struct task_struct *prev,
>  				struct task_struct *next,


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/