diff options
Diffstat (limited to 'kernel/trace/blktrace.c')
-rw-r--r-- | kernel/trace/blktrace.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index d24a10b8411a..1f32e4edf490 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c | |||
@@ -33,7 +33,7 @@ static struct trace_array *blk_tr; | |||
33 | static int __read_mostly blk_tracer_enabled; | 33 | static int __read_mostly blk_tracer_enabled; |
34 | 34 | ||
35 | /* Select an alternative, minimalistic output than the original one */ | 35 | /* Select an alternative, minimalistic output than the original one */ |
36 | #define TRACE_BLK_OPT_CLASSIC 0x1 | 36 | #define TRACE_BLK_OPT_CLASSIC 0x1 |
37 | 37 | ||
38 | static struct tracer_opt blk_tracer_opts[] = { | 38 | static struct tracer_opt blk_tracer_opts[] = { |
39 | /* Default disable the minimalistic output */ | 39 | /* Default disable the minimalistic output */ |
@@ -564,7 +564,7 @@ EXPORT_SYMBOL_GPL(blk_trace_startstop); | |||
564 | /** | 564 | /** |
565 | * blk_trace_ioctl: - handle the ioctls associated with tracing | 565 | * blk_trace_ioctl: - handle the ioctls associated with tracing |
566 | * @bdev: the block device | 566 | * @bdev: the block device |
567 | * @cmd: the ioctl cmd | 567 | * @cmd: the ioctl cmd |
568 | * @arg: the argument data, if any | 568 | * @arg: the argument data, if any |
569 | * | 569 | * |
570 | **/ | 570 | **/ |
@@ -1128,9 +1128,9 @@ static void blk_tracer_reset(struct trace_array *tr) | |||
1128 | 1128 | ||
1129 | static struct { | 1129 | static struct { |
1130 | const char *act[2]; | 1130 | const char *act[2]; |
1131 | int (*print)(struct trace_seq *s, const struct trace_entry *ent); | 1131 | int (*print)(struct trace_seq *s, const struct trace_entry *ent); |
1132 | } what2act[] __read_mostly = { | 1132 | } what2act[] __read_mostly = { |
1133 | [__BLK_TA_QUEUE] = {{ "Q", "queue" }, blk_log_generic }, | 1133 | [__BLK_TA_QUEUE] = {{ "Q", "queue" }, blk_log_generic }, |
1134 | [__BLK_TA_BACKMERGE] = {{ "M", "backmerge" }, blk_log_generic }, | 1134 | [__BLK_TA_BACKMERGE] = {{ "M", "backmerge" }, blk_log_generic }, |
1135 | [__BLK_TA_FRONTMERGE] = {{ "F", "frontmerge" }, blk_log_generic }, | 1135 | [__BLK_TA_FRONTMERGE] = {{ "F", "frontmerge" }, blk_log_generic }, |
1136 | [__BLK_TA_GETRQ] = {{ "G", "getrq" }, blk_log_generic }, | 1136 | [__BLK_TA_GETRQ] = {{ "G", "getrq" }, blk_log_generic }, |
@@ -1229,7 +1229,7 @@ static struct tracer blk_tracer __read_mostly = { | |||
1229 | }; | 1229 | }; |
1230 | 1230 | ||
1231 | static struct trace_event trace_blk_event = { | 1231 | static struct trace_event trace_blk_event = { |
1232 | .type = TRACE_BLK, | 1232 | .type = TRACE_BLK, |
1233 | .trace = blk_trace_event_print, | 1233 | .trace = blk_trace_event_print, |
1234 | .binary = blk_trace_event_print_binary, | 1234 | .binary = blk_trace_event_print_binary, |
1235 | }; | 1235 | }; |