aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mmiotrace.h
diff options
context:
space:
mode:
authorPekka Paalanen <pq@iki.fi>2008-05-12 15:21:03 -0400
committerThomas Gleixner <tglx@linutronix.de>2008-05-24 05:27:36 -0400
commitdee310d0adf41019aca476052ac3085ff286d9be (patch)
tree8e5b7982b787fc4036ad01a8a4a58accf9e15127 /include/linux/mmiotrace.h
parent87e547fe41a8b57d6d80afc67a0031fbe477eb0d (diff)
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 @@
2#define MMIOTRACE_H 2#define MMIOTRACE_H
3 3
4#include <linux/types.h> 4#include <linux/types.h>
5
6#include <linux/list.h> 5#include <linux/list.h>
7 6
8struct kmmio_probe; 7struct kmmio_probe;
@@ -37,14 +36,15 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
37 36
38/* Called from ioremap.c */ 37/* Called from ioremap.c */
39#ifdef CONFIG_MMIOTRACE 38#ifdef CONFIG_MMIOTRACE
40extern void 39extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
41mmiotrace_ioremap(unsigned long offset, unsigned long size, void __iomem *addr); 40 void __iomem *addr);
42extern void mmiotrace_iounmap(volatile void __iomem *addr); 41extern void mmiotrace_iounmap(volatile void __iomem *addr);
43#else 42#else
44static inline void 43static inline void mmiotrace_ioremap(resource_size_t offset,
45mmiotrace_ioremap(unsigned long offset, unsigned long size, void __iomem *addr) 44 unsigned long size, void __iomem *addr)
46{ 45{
47} 46}
47
48static inline void mmiotrace_iounmap(volatile void __iomem *addr) 48static inline void mmiotrace_iounmap(volatile void __iomem *addr)
49{ 49{
50} 50}
@@ -60,7 +60,7 @@ enum mm_io_opcode {
60}; 60};
61 61
62struct mmiotrace_rw { 62struct mmiotrace_rw {
63 unsigned long phys; /* PCI address of register */ 63 resource_size_t phys; /* PCI address of register */
64 unsigned long value; 64 unsigned long value;
65 unsigned long pc; /* optional program counter */ 65 unsigned long pc; /* optional program counter */
66 int map_id; 66 int map_id;
@@ -69,7 +69,7 @@ struct mmiotrace_rw {
69}; 69};
70 70
71struct mmiotrace_map { 71struct mmiotrace_map {
72 unsigned long phys; /* base address in PCI space */ 72 resource_size_t phys; /* base address in PCI space */
73 unsigned long virt; /* base virtual address */ 73 unsigned long virt; /* base virtual address */
74 unsigned long len; /* mapping size */ 74 unsigned long len; /* mapping size */
75 int map_id; 75 int map_id;