netfilter: xtables: move extension arguments into compound structure (2/6)

[safe/jmp/linux-2.6] / include / linux / mmiotrace.h

diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
index c88a9c1..61d19e1 100644 (file)
--- a/include/linux/mmiotrace.h
+++ b/include/linux/mmiotrace.h
@@ -1,10 +1,7 @@
 #ifndef MMIOTRACE_H
 #define MMIOTRACE_H
 
-#include <asm/types.h>
-
-#ifdef __KERNEL__
-
+#include <linux/types.h>
 #include <linux/list.h>
 
 struct kmmio_probe;
@@ -21,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? */
@@ -31,8 +28,6 @@ static inline int is_kmmio_active(void)
        return kmmio_count;
 }
 
-extern void reference_kmmio(void);
-extern void unreference_kmmio(void);
 extern int register_kmmio_probe(struct kmmio_probe *p);
 extern void unregister_kmmio_probe(struct kmmio_probe *p);
 
@@ -41,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)
 {
 }
@@ -64,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;
@@ -73,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;
@@ -86,6 +82,4 @@ extern void disable_mmiotrace(void);
 extern void mmio_trace_rw(struct mmiotrace_rw *rw);
 extern void mmio_trace_mapping(struct mmiotrace_map *map);
 
-#endif /* __KERNEL__ */
-
 #endif /* MMIOTRACE_H */