Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[karo-tx-linux.git] / kernel / trace / trace_output.c

diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 02a4aeb22c4785cc808a7906c970dfa420796cbe..08f9bab8089e74c2acd63e0eaa7ef53f922b88c4 100644 (file)
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -4,7 +4,6 @@
  * Copyright (C) 2008 Red Hat Inc, Steven Rostedt <srostedt@redhat.com>
  *
  */
-
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/ftrace.h>
@@ -1161,11 +1160,11 @@ trace_hwlat_print(struct trace_iterator *iter, int flags,
 
        trace_assign_type(field, entry);
 
-       trace_seq_printf(s, "#%-5u inner/outer(us): %4llu/%-5llu ts:%ld.%09ld",
+       trace_seq_printf(s, "#%-5u inner/outer(us): %4llu/%-5llu ts:%lld.%09ld",
                         field->seqnum,
                         field->duration,
                         field->outer_duration,
-                        field->timestamp.tv_sec,
+                        (long long)field->timestamp.tv_sec,
                         field->timestamp.tv_nsec);
 
        if (field->nmi_count) {
@@ -1195,10 +1194,10 @@ trace_hwlat_raw(struct trace_iterator *iter, int flags,
 
        trace_assign_type(field, iter->ent);
 
-       trace_seq_printf(s, "%llu %lld %ld %09ld %u\n",
+       trace_seq_printf(s, "%llu %lld %lld %09ld %u\n",
                         field->duration,
                         field->outer_duration,
-                        field->timestamp.tv_sec,
+                        (long long)field->timestamp.tv_sec,
                         field->timestamp.tv_nsec,
                         field->seqnum);