summaryrefslogtreecommitdiffstats
path: root/include/linux/mmiotrace.h
diff options
context:
space:
mode:
authorPekka Paalanen <pq@iki.fi>2008-05-12 21:21:03 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-05-24 11:27:36 +0200
commitdee310d0adf41019aca476052ac3085ff286d9be (patch)
tree8e5b7982b787fc4036ad01a8a4a58accf9e15127 /include/linux/mmiotrace.h
parent87e547fe41a8b57d6d80afc67a0031fbe477eb0d (diff)
downloadlinux-dee310d0adf41019aca476052ac3085ff286d9be.tar.gz
linux-dee310d0adf41019aca476052ac3085ff286d9be.tar.bz2
linux-dee310d0adf41019aca476052ac3085ff286d9be.zip
x86 mmiotrace: use resource_size_t for phys addresses
Signed-off-by: Pekka Paalanen <pq@iki.fi> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/mmiotrace.h')
-rw-r--r--include/linux/mmiotrace.h14
1 files changed, 7 insertions, 7 deletions
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;