Skip to content

Commit

Permalink
tracing: Remove orphaned function ftrace_nr_registered_ops()
Browse files Browse the repository at this point in the history
Remove ftrace_nr_registered_ops() because it is no longer used.

ftrace_nr_registered_ops() has been introduced by commit ea701f1
("ftrace: Add selftest to test function trace recursion protection"), but
its caller has been removed by commit 05cbbf6 ("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: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
  • Loading branch information
Masami Hiramatsu authored and Steven Rostedt (VMware) committed Jul 26, 2018
1 parent 7b144b6 commit 72809cb
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 30 deletions.
6 changes: 0 additions & 6 deletions include/linux/ftrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) { }
Expand Down Expand Up @@ -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);
Expand Down
24 changes: 0 additions & 24 deletions kernel/trace/ftrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit 72809cb

Please sign in to comment.