Merge branch 'linus' into timers/nohz

[mv-sheeva.git] / include / linux / mmiotrace.h

diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
index de8e91258da7799a16d13092bcdf49b45305b18d..61d19e1b7a0b0684ec6799b1d2351e167f10a1ae 100644 (file)
--- 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;
@@ -19,7 +18,7 @@ struct kmmio_probe {
        unsigned long len; /* length of the probe region */
        kmmio_pre_handler_t pre_handler; /* Called before addr is executed. */
        kmmio_post_handler_t post_handler; /* Called after addr is executed */
-       void *user_data;
+       void *private;
 };
 
 /* kmmio is active by some kmmio_probes? */
@@ -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;