Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72809cbf authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Steven Rostedt (VMware)
Browse files

tracing: Remove orphaned function ftrace_nr_registered_ops() 

Remove ftrace_nr_registered_ops() because it is no longer used.

ftrace_nr_registered_ops() has been introduced by commit ea701f11
("ftrace: Add selftest to test function trace recursion protection"), but
its caller has been removed by commit 05cbbf64 ("tracing: Fix selftest
function recursion accounting"). So it is not called anymore.

Link: http://lkml.kernel.org/r/153260907227.12474.5234899025934963683.stgit@devbox



Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 7b144b6c

include/linux/ftrace.h

+0 −6
Original line number Diff line number Diff line
@@ -234,10 +234,6 @@ extern void ftrace_stub(unsigned long a0, unsigned long a1, 
 */

#define register_ftrace_function(ops) ({ 0; })

#define unregister_ftrace_function(ops) ({ 0; })

static inline int ftrace_nr_registered_ops(void)

{

	return 0;

}

static inline void ftrace_kill(void) { }

static inline void ftrace_free_init_mem(void) { }

static inline void ftrace_free_mem(struct module *mod, void *start, void *end) { }
@@ -328,8 +324,6 @@ struct seq_file; 


extern int ftrace_text_reserved(const void *start, const void *end);



extern int ftrace_nr_registered_ops(void);



struct ftrace_ops *ftrace_ops_trampoline(unsigned long addr);



bool is_ftrace_trampoline(unsigned long addr);

kernel/trace/ftrace.c

+0 −24
Original line number Diff line number Diff line
@@ -157,30 +157,6 @@ static inline void ftrace_ops_init(struct ftrace_ops *ops) 
#endif

}



/**

 * ftrace_nr_registered_ops - return number of ops registered

 *

 * Returns the number of ftrace_ops registered and tracing functions

 */

int ftrace_nr_registered_ops(void)

{

	struct ftrace_ops *ops;

	int cnt = 0;



	mutex_lock(&ftrace_lock);



	for (ops = rcu_dereference_protected(ftrace_ops_list,

					     lockdep_is_held(&ftrace_lock));

	     ops != &ftrace_list_end;

	     ops = rcu_dereference_protected(ops->next,

					     lockdep_is_held(&ftrace_lock)))

		cnt++;



	mutex_unlock(&ftrace_lock);



	return cnt;

}



static void ftrace_pid_func(unsigned long ip, unsigned long parent_ip,

			    struct ftrace_ops *op, struct pt_regs *regs)

{