3 files changed, 25 insertions, 20 deletions

diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
index 278998c1998f..3b04a0126121 100644
--- a/arch/x86/mm/mmio-mod.c
+++ b/arch/x86/mm/mmio-mod.c
@@ -48,7 +48,7 @@ struct trap_reason {
 struct remap_trace {
         struct list_head list;
         struct kmmio_probe probe;
-        unsigned long phys;
+        resource_size_t phys;
         unsigned long id;
 };
 
@@ -275,7 +275,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
         put_cpu_var(pf_reason);
 }
 
-static void ioremap_trace_core(unsigned long offset, unsigned long size,
+static void ioremap_trace_core(resource_size_t offset, unsigned long size,
                                                         void __iomem *addr)
 {
         static atomic_t next_id;
@@ -319,13 +319,14 @@ not_enabled:
         spin_unlock_irq(&trace_lock);
 }
 
-void
-mmiotrace_ioremap(unsigned long offset, unsigned long size, void __iomem *addr)
+void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
+                                                void __iomem *addr)
 {
         if (!is_enabled()) /* recheck and proper locking in *_core() */
                 return;
 
-        pr_debug(NAME "ioremap_*(0x%lx, 0x%lx) = %p\n", offset, size, addr);
+        pr_debug(NAME "ioremap_*(0x%llx, 0x%lx) = %p\n",
+                                (unsigned long long)offset, size, addr);
         if ((filter_offset) && (offset != filter_offset))
                 return;
         ioremap_trace_core(offset, size, addr);
diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
index de8e91258da7..5cbbc374e945 100644
--- a/include/linux/mmiotrace.h
+++ b/include/linux/mmiotrace.h
@@ -2,7 +2,6 @@
 #define MMIOTRACE_H
 
 #include <linux/types.h>
-
 #include <linux/list.h>
 
 struct kmmio_probe;
@@ -37,14 +36,15 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
 
 /* Called from ioremap.c */
 #ifdef CONFIG_MMIOTRACE
-extern void
-mmiotrace_ioremap(unsigned long offset, unsigned long size, void __iomem *addr);
+extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
+                                                        void __iomem *addr);
 extern void mmiotrace_iounmap(volatile void __iomem *addr);
 #else
-static inline void
-mmiotrace_ioremap(unsigned long offset, unsigned long size, void __iomem *addr)
+static inline void mmiotrace_ioremap(resource_size_t offset,
+                                        unsigned long size, void __iomem *addr)
 {
 }
+
 static inline void mmiotrace_iounmap(volatile void __iomem *addr)
 {
 }
@@ -60,7 +60,7 @@ enum mm_io_opcode {
 };
 
 struct mmiotrace_rw {
-        unsigned long phys;     /* PCI address of register */
+        resource_size_t phys;   /* PCI address of register */
         unsigned long value;
         unsigned long pc;       /* optional program counter */
         int map_id;
@@ -69,7 +69,7 @@ struct mmiotrace_rw {
 };
 
 struct mmiotrace_map {
-        unsigned long phys;     /* base address in PCI space */
+        resource_size_t phys;   /* base address in PCI space */
         unsigned long virt;     /* base virtual address */
         unsigned long len;      /* mapping size */
         int map_id;
diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
index 3c1dacdc2d85..b13dc19dcbb4 100644
--- a/kernel/trace/trace_mmiotrace.c
+++ b/kernel/trace/trace_mmiotrace.c
@@ -184,20 +184,23 @@ static int mmio_print_rw(struct trace_iterator *iter)
         switch (entry->mmiorw.opcode) {
         case MMIO_READ:
                 ret = trace_seq_printf(s,
-                        "R %d %lu.%06lu %d 0x%lx 0x%lx 0x%lx %d\n",
-                        rw->width, secs, usec_rem, rw->map_id, rw->phys,
+                        "R %d %lu.%06lu %d 0x%llx 0x%lx 0x%lx %d\n",
+                        rw->width, secs, usec_rem, rw->map_id,
+                        (unsigned long long)rw->phys,
                         rw->value, rw->pc, 0);
                 break;
         case MMIO_WRITE:
                 ret = trace_seq_printf(s,
-                        "W %d %lu.%06lu %d 0x%lx 0x%lx 0x%lx %d\n",
-                        rw->width, secs, usec_rem, rw->map_id, rw->phys,
+                        "W %d %lu.%06lu %d 0x%llx 0x%lx 0x%lx %d\n",
+                        rw->width, secs, usec_rem, rw->map_id,
+                        (unsigned long long)rw->phys,
                         rw->value, rw->pc, 0);
                 break;
         case MMIO_UNKNOWN_OP:
                 ret = trace_seq_printf(s,
-                        "UNKNOWN %lu.%06lu %d 0x%lx %02x,%02x,%02x 0x%lx %d\n",
-                        secs, usec_rem, rw->map_id, rw->phys,
+                        "UNKNOWN %lu.%06lu %d 0x%llx %02x,%02x,%02x 0x%lx %d\n",
+                        secs, usec_rem, rw->map_id,
+                        (unsigned long long)rw->phys,
                         (rw->value >> 16) & 0xff, (rw->value >> 8) & 0xff,
                         (rw->value >> 0) & 0xff, rw->pc, 0);
                 break;
@@ -223,8 +226,9 @@ static int mmio_print_map(struct trace_iterator *iter)
         switch (entry->mmiorw.opcode) {
         case MMIO_PROBE:
                 ret = trace_seq_printf(s,
-                        "MAP %lu.%06lu %d 0x%lx 0x%lx 0x%lx 0x%lx %d\n",
-                        secs, usec_rem, m->map_id, m->phys, m->virt, m->len,
+                        "MAP %lu.%06lu %d 0x%llx 0x%lx 0x%lx 0x%lx %d\n",
+                        secs, usec_rem, m->map_id,
+                        (unsigned long long)m->phys, m->virt, m->len,
                         0UL, 0);
                 break;
         case MMIO_UNPROBE: