diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-10 17:46:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-10 18:37:22 -0400 |
commit | a9f627c9df2b6a242cdc25d46f87191941cd0844 (patch) | |
tree | b4f3942e5ecc01574735003fa093c161691340be /include/asm-ia64 | |
parent | cfa7fd72ca03ac2324e8e469bd4b9ecc6f53394c (diff) |
[PATCH] ia64/sn __iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-ia64')
-rw-r--r-- | include/asm-ia64/sn/pcibr_provider.h | 2 | ||||
-rw-r--r-- | include/asm-ia64/sn/tioca_provider.h | 4 | ||||
-rw-r--r-- | include/asm-ia64/sn/tioce_provider.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-ia64/sn/pcibr_provider.h b/include/asm-ia64/sn/pcibr_provider.h index e3b0c3fe5eed..da3eade0cae2 100644 --- a/include/asm-ia64/sn/pcibr_provider.h +++ b/include/asm-ia64/sn/pcibr_provider.h | |||
@@ -135,7 +135,7 @@ extern void pcireg_intr_addr_addr_set(struct pcibus_info *, int, u64 | |||
135 | extern void pcireg_force_intr_set(struct pcibus_info *, int); | 135 | extern void pcireg_force_intr_set(struct pcibus_info *, int); |
136 | extern u64 pcireg_wrb_flush_get(struct pcibus_info *, int); | 136 | extern u64 pcireg_wrb_flush_get(struct pcibus_info *, int); |
137 | extern void pcireg_int_ate_set(struct pcibus_info *, int, u64); | 137 | extern void pcireg_int_ate_set(struct pcibus_info *, int, u64); |
138 | extern u64 * pcireg_int_ate_addr(struct pcibus_info *, int); | 138 | extern u64 __iomem * pcireg_int_ate_addr(struct pcibus_info *, int); |
139 | extern void pcibr_force_interrupt(struct sn_irq_info *sn_irq_info); | 139 | extern void pcibr_force_interrupt(struct sn_irq_info *sn_irq_info); |
140 | extern void pcibr_change_devices_irq(struct sn_irq_info *sn_irq_info); | 140 | extern void pcibr_change_devices_irq(struct sn_irq_info *sn_irq_info); |
141 | extern int pcibr_ate_alloc(struct pcibus_info *, int); | 141 | extern int pcibr_ate_alloc(struct pcibus_info *, int); |
diff --git a/include/asm-ia64/sn/tioca_provider.h b/include/asm-ia64/sn/tioca_provider.h index 65cdd73c2a57..9a820ac61be3 100644 --- a/include/asm-ia64/sn/tioca_provider.h +++ b/include/asm-ia64/sn/tioca_provider.h | |||
@@ -162,11 +162,11 @@ static inline void | |||
162 | tioca_tlbflush(struct tioca_kernel *tioca_kernel) | 162 | tioca_tlbflush(struct tioca_kernel *tioca_kernel) |
163 | { | 163 | { |
164 | volatile u64 tmp; | 164 | volatile u64 tmp; |
165 | volatile struct tioca *ca_base; | 165 | volatile struct tioca __iomem *ca_base; |
166 | struct tioca_common *tioca_common; | 166 | struct tioca_common *tioca_common; |
167 | 167 | ||
168 | tioca_common = tioca_kernel->ca_common; | 168 | tioca_common = tioca_kernel->ca_common; |
169 | ca_base = (struct tioca *)tioca_common->ca_common.bs_base; | 169 | ca_base = (struct tioca __iomem *)tioca_common->ca_common.bs_base; |
170 | 170 | ||
171 | /* | 171 | /* |
172 | * Explicit flushes not needed if GART is in cached mode | 172 | * Explicit flushes not needed if GART is in cached mode |
diff --git a/include/asm-ia64/sn/tioce_provider.h b/include/asm-ia64/sn/tioce_provider.h index 6d62b13f7ae7..32c32f30b099 100644 --- a/include/asm-ia64/sn/tioce_provider.h +++ b/include/asm-ia64/sn/tioce_provider.h | |||
@@ -53,7 +53,7 @@ struct tioce_dmamap { | |||
53 | u64 ct_start; /* coretalk start address */ | 53 | u64 ct_start; /* coretalk start address */ |
54 | u64 pci_start; /* bus start address */ | 54 | u64 pci_start; /* bus start address */ |
55 | 55 | ||
56 | u64 *ate_hw; /* hw ptr of first ate in map */ | 56 | u64 __iomem *ate_hw;/* hw ptr of first ate in map */ |
57 | u64 *ate_shadow; /* shadow ptr of firat ate */ | 57 | u64 *ate_shadow; /* shadow ptr of firat ate */ |
58 | u16 ate_count; /* # ate's in the map */ | 58 | u16 ate_count; /* # ate's in the map */ |
59 | }; | 59 | }; |