diff options
Diffstat (limited to 'kernel/trace/blktrace.c')
-rw-r--r-- | kernel/trace/blktrace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index d43cdac7c754..5b28f0f119c5 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c | |||
@@ -994,8 +994,8 @@ static void get_pdu_remap(const struct trace_entry *ent, | |||
994 | static int blk_log_action_iter(struct trace_iterator *iter, const char *act) | 994 | static int blk_log_action_iter(struct trace_iterator *iter, const char *act) |
995 | { | 995 | { |
996 | char rwbs[6]; | 996 | char rwbs[6]; |
997 | unsigned long long ts = ns2usecs(iter->ts); | 997 | unsigned long long ts = iter->ts; |
998 | unsigned long usec_rem = do_div(ts, USEC_PER_SEC); | 998 | unsigned long nsec_rem = do_div(ts, NSEC_PER_SEC); |
999 | unsigned secs = (unsigned long)ts; | 999 | unsigned secs = (unsigned long)ts; |
1000 | const struct trace_entry *ent = iter->ent; | 1000 | const struct trace_entry *ent = iter->ent; |
1001 | const struct blk_io_trace *t = (const struct blk_io_trace *)ent; | 1001 | const struct blk_io_trace *t = (const struct blk_io_trace *)ent; |
@@ -1003,9 +1003,9 @@ static int blk_log_action_iter(struct trace_iterator *iter, const char *act) | |||
1003 | fill_rwbs(rwbs, t); | 1003 | fill_rwbs(rwbs, t); |
1004 | 1004 | ||
1005 | return trace_seq_printf(&iter->seq, | 1005 | return trace_seq_printf(&iter->seq, |
1006 | "%3d,%-3d %2d %5d.%06lu %5u %2s %3s ", | 1006 | "%3d,%-3d %2d %5d.%09lu %5u %2s %3s ", |
1007 | MAJOR(t->device), MINOR(t->device), iter->cpu, | 1007 | MAJOR(t->device), MINOR(t->device), iter->cpu, |
1008 | secs, usec_rem, ent->pid, act, rwbs); | 1008 | secs, nsec_rem, ent->pid, act, rwbs); |
1009 | } | 1009 | } |
1010 | 1010 | ||
1011 | static int blk_log_action_seq(struct trace_seq *s, const struct blk_io_trace *t, | 1011 | static int blk_log_action_seq(struct trace_seq *s, const struct blk_io_trace *t, |