diff options
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 9 | 
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 8a76339a9e6..55e48511d7c 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1936,7 +1936,7 @@ static enum print_line_t print_trace_fmt(struct trace_iterator *iter)  	}  	if (event) -		return event->trace(iter, sym_flags); +		return event->funcs->trace(iter, sym_flags, event);  	if (!trace_seq_printf(s, "Unknown type %d\n", entry->type))  		goto partial; @@ -1962,7 +1962,7 @@ static enum print_line_t print_raw_fmt(struct trace_iterator *iter)  	event = ftrace_find_event(entry->type);  	if (event) -		return event->raw(iter, 0); +		return event->funcs->raw(iter, 0, event);  	if (!trace_seq_printf(s, "%d ?\n", entry->type))  		goto partial; @@ -1989,7 +1989,7 @@ static enum print_line_t print_hex_fmt(struct trace_iterator *iter)  	event = ftrace_find_event(entry->type);  	if (event) { -		enum print_line_t ret = event->hex(iter, 0); +		enum print_line_t ret = event->funcs->hex(iter, 0, event);  		if (ret != TRACE_TYPE_HANDLED)  			return ret;  	} @@ -2014,7 +2014,8 @@ static enum print_line_t print_bin_fmt(struct trace_iterator *iter)  	}  	event = ftrace_find_event(entry->type); -	return event ? event->binary(iter, 0) : TRACE_TYPE_HANDLED; +	return event ? event->funcs->binary(iter, 0, event) : +		TRACE_TYPE_HANDLED;  }  int trace_empty(struct trace_iterator *iter)  |