Commit b115c409 authored by Jan Kiszka's avatar Jan Kiszka
Browse files

Revert "ipipe: Register function tracer for direct and exclusive invocation"

This reverts commit e00888b4

.

We now have an I-pipe-compatible dispatching function for ftrace.
Signed-off-by: Jan Kiszka's avatarJan Kiszka <jan.kiszka@siemens.com>

Conflicts:
	include/linux/ftrace.h
	kernel/trace/ftrace.c
parent c1cdeed6
...@@ -108,7 +108,6 @@ enum { ...@@ -108,7 +108,6 @@ enum {
FTRACE_OPS_FL_ADDING = 1 << 9, FTRACE_OPS_FL_ADDING = 1 << 9,
FTRACE_OPS_FL_REMOVING = 1 << 10, FTRACE_OPS_FL_REMOVING = 1 << 10,
FTRACE_OPS_FL_MODIFYING = 1 << 11, FTRACE_OPS_FL_MODIFYING = 1 << 11,
FTRACE_OPS_FL_IPIPE_EXCLUSIVE = 1 << 12,
}; };
#ifdef CONFIG_DYNAMIC_FTRACE #ifdef CONFIG_DYNAMIC_FTRACE
......
...@@ -1319,7 +1319,7 @@ ipipe_trace_function(unsigned long ip, unsigned long parent_ip, ...@@ -1319,7 +1319,7 @@ ipipe_trace_function(unsigned long ip, unsigned long parent_ip,
static struct ftrace_ops ipipe_trace_ops = { static struct ftrace_ops ipipe_trace_ops = {
.func = ipipe_trace_function, .func = ipipe_trace_function,
.flags = FTRACE_OPS_FL_IPIPE_EXCLUSIVE, .flags = FTRACE_OPS_FL_RECURSION_SAFE,
}; };
static ssize_t __ipipe_wr_enable(struct file *file, const char __user *buffer, static ssize_t __ipipe_wr_enable(struct file *file, const char __user *buffer,
......
...@@ -252,17 +252,8 @@ static inline void update_function_graph_func(void) { } ...@@ -252,17 +252,8 @@ static inline void update_function_graph_func(void) { }
static void update_ftrace_function(void) static void update_ftrace_function(void)
{ {
struct ftrace_ops *ops;
ftrace_func_t func; ftrace_func_t func;
for (ops = ftrace_ops_list;
ops != &ftrace_list_end; ops = ops->next)
if (ops->flags & FTRACE_OPS_FL_IPIPE_EXCLUSIVE) {
function_trace_op = ops;
ftrace_trace_function = ops->func;
return;
}
/* /*
* Prepare the ftrace_ops that the arch callback will use. * Prepare the ftrace_ops that the arch callback will use.
* If there's only one ftrace_ops registered, the ftrace_ops_list * If there's only one ftrace_ops registered, the ftrace_ops_list
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment