2 files changed, 8 insertions, 5 deletions

diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h
index 6bca4cc0063c..5f172703eb4f 100644
--- a/include/trace/events/writeback.h
+++ b/include/trace/events/writeback.h
@@ -298,7 +298,7 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template,
                 __array(char, name, 32)
                 __field(unsigned long, ino)
                 __field(unsigned long, state)
-                __field(unsigned long, age)
+                __field(unsigned long, dirtied_when)
                 __field(unsigned long, writeback_index)
                 __field(long, nr_to_write)
                 __field(unsigned long, wrote)
@@ -309,19 +309,19 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template,
                         dev_name(inode->i_mapping->backing_dev_info->dev), 32);
                 __entry->ino            = inode->i_ino;
                 __entry->state          = inode->i_state;
-                __entry->age            = (jiffies - inode->dirtied_when) *
-                                                                1000 / HZ;
+                __entry->dirtied_when   = inode->dirtied_when;
                 __entry->writeback_index = inode->i_mapping->writeback_index;
                 __entry->nr_to_write    = nr_to_write;
                 __entry->wrote          = nr_to_write - wbc->nr_to_write;
         ),
 
-        TP_printk("bdi %s: ino=%lu state=%s age=%lu "
+        TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu "
                   "index=%lu to_write=%ld wrote=%lu",
                   __entry->name,
                   __entry->ino,
                   show_inode_state(__entry->state),
-                  __entry->age,
+                  __entry->dirtied_when,
+                  (jiffies - __entry->dirtied_when) / HZ,
                   __entry->writeback_index,
                   __entry->nr_to_write,
                   __entry->wrote
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index 533c49f48047..769724944fc6 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -711,6 +711,9 @@ __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call
 #undef __perf_count
 #define __perf_count(c) __count = (c)
 
+#undef TP_perf_assign
+#define TP_perf_assign(args...) args
+
 #undef DECLARE_EVENT_CLASS
 #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print)  \
 static notrace void                                                     \