diff options
Diffstat (limited to 'include/trace/events/printk.h')
| -rw-r--r-- | include/trace/events/printk.h | 25 | 
1 files changed, 6 insertions, 19 deletions
diff --git a/include/trace/events/printk.h b/include/trace/events/printk.h index 94ec79cc011..c008bc99f9f 100644 --- a/include/trace/events/printk.h +++ b/include/trace/events/printk.h @@ -6,31 +6,18 @@  #include <linux/tracepoint.h> -TRACE_EVENT_CONDITION(console, -	TP_PROTO(const char *log_buf, unsigned start, unsigned end, -		 unsigned log_buf_len), +TRACE_EVENT(console, +	TP_PROTO(const char *text, size_t len), -	TP_ARGS(log_buf, start, end, log_buf_len), - -	TP_CONDITION(start != end), +	TP_ARGS(text, len),  	TP_STRUCT__entry( -		__dynamic_array(char, msg, end - start + 1) +		__dynamic_array(char, msg, len + 1)  	),  	TP_fast_assign( -		if ((start & (log_buf_len - 1)) > (end & (log_buf_len - 1))) { -			memcpy(__get_dynamic_array(msg), -			       log_buf + (start & (log_buf_len - 1)), -			       log_buf_len - (start & (log_buf_len - 1))); -			memcpy((char *)__get_dynamic_array(msg) + -			       log_buf_len - (start & (log_buf_len - 1)), -			       log_buf, end & (log_buf_len - 1)); -		} else -			memcpy(__get_dynamic_array(msg), -			       log_buf + (start & (log_buf_len - 1)), -			       end - start); -		((char *)__get_dynamic_array(msg))[end - start] = 0; +		memcpy(__get_dynamic_array(msg), text, len); +		((char *)__get_dynamic_array(msg))[len] = 0;  	),  	TP_printk("%s", __get_str(msg))  |