aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/blktrace.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/trace/blktrace.c')
-rw-r--r--kernel/trace/blktrace.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 19d93f83e3c3..36ea2b65dcdc 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1336,7 +1336,7 @@ out:
1336} 1336}
1337 1337
1338static enum print_line_t blk_trace_event_print(struct trace_iterator *iter, 1338static enum print_line_t blk_trace_event_print(struct trace_iterator *iter,
1339 int flags) 1339 int flags, struct trace_event *event)
1340{ 1340{
1341 return print_one_line(iter, false); 1341 return print_one_line(iter, false);
1342} 1342}
@@ -1358,7 +1358,8 @@ static int blk_trace_synthesize_old_trace(struct trace_iterator *iter)
1358} 1358}
1359 1359
1360static enum print_line_t 1360static enum print_line_t
1361blk_trace_event_print_binary(struct trace_iterator *iter, int flags) 1361blk_trace_event_print_binary(struct trace_iterator *iter, int flags,
1362 struct trace_event *event)
1362{ 1363{
1363 return blk_trace_synthesize_old_trace(iter) ? 1364 return blk_trace_synthesize_old_trace(iter) ?
1364 TRACE_TYPE_HANDLED : TRACE_TYPE_PARTIAL_LINE; 1365 TRACE_TYPE_HANDLED : TRACE_TYPE_PARTIAL_LINE;
@@ -1396,12 +1397,16 @@ static struct tracer blk_tracer __read_mostly = {
1396 .set_flag = blk_tracer_set_flag, 1397 .set_flag = blk_tracer_set_flag,
1397}; 1398};
1398 1399
1399static struct trace_event trace_blk_event = { 1400static struct trace_event_functions trace_blk_event_funcs = {
1400 .type = TRACE_BLK,
1401 .trace = blk_trace_event_print, 1401 .trace = blk_trace_event_print,
1402 .binary = blk_trace_event_print_binary, 1402 .binary = blk_trace_event_print_binary,
1403}; 1403};
1404 1404
1405static struct trace_event trace_blk_event = {
1406 .type = TRACE_BLK,
1407 .funcs = &trace_blk_event_funcs,
1408};
1409
1405static int __init init_blk_tracer(void) 1410static int __init init_blk_tracer(void)
1406{ 1411{
1407 if (!register_ftrace_event(&trace_blk_event)) { 1412 if (!register_ftrace_event(&trace_blk_event)) {