1 files changed, 10 insertions, 4 deletions

diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
index 1a266aa08e1a..0e819f47bb7a 100644
--- a/kernel/trace/trace_mmiotrace.c
+++ b/kernel/trace/trace_mmiotrace.c
@@ -178,15 +178,17 @@ print_out:
 static enum print_line_t mmio_print_rw(struct trace_iterator *iter)
 {
         struct trace_entry *entry = iter->ent;
-        struct trace_mmiotrace_rw *field =
-                (struct trace_mmiotrace_rw *)entry;
-        struct mmiotrace_rw *rw = &field->rw;
+        struct trace_mmiotrace_rw *field;
+        struct mmiotrace_rw *rw;
         struct trace_seq *s     = &iter->seq;
         unsigned long long t    = ns2usecs(iter->ts);
         unsigned long usec_rem  = do_div(t, 1000000ULL);
         unsigned secs           = (unsigned long)t;
         int ret = 1;
 
+        trace_assign_type(field, entry);
+        rw = &field->rw;
+
         switch (rw->opcode) {
         case MMIO_READ:
                 ret = trace_seq_printf(s,
@@ -222,13 +224,17 @@ static enum print_line_t mmio_print_rw(struct trace_iterator *iter)
 static enum print_line_t mmio_print_map(struct trace_iterator *iter)
 {
         struct trace_entry *entry = iter->ent;
-        struct mmiotrace_map *m = (struct mmiotrace_map *)entry;
+        struct trace_mmiotrace_map *field;
+        struct mmiotrace_map *m;
         struct trace_seq *s     = &iter->seq;
         unsigned long long t    = ns2usecs(iter->ts);
         unsigned long usec_rem  = do_div(t, 1000000ULL);
         unsigned secs           = (unsigned long)t;
         int ret;
 
+        trace_assign_type(field, entry);
+        m = &field->map;
+
         switch (m->opcode) {
         case MMIO_PROBE:
                 ret = trace_seq_printf(s,