Skip to contentSkip to conversation

ia64/sn __iomem annotations

PATCH New Al Viro 1 participant 1 message Oct 10, 2006

lore
Share & tools
lore

Al Viro

author
#0 lore raw

PATCH 1/1 ia64/sn __iomem annotations

---
 arch/ia64/sn/pci/pcibr/pcibr_ate.c   |    2 +-
 arch/ia64/sn/pci/tioce_provider.c    |   42 +++++++++++++++++-----------------
 include/asm-ia64/sn/pcibr_provider.h |    2 +-
 include/asm-ia64/sn/tioca_provider.h |    4 ++-
 include/asm-ia64/sn/tioce_provider.h |    2 +-
 5 files changed, 26 insertions(+), 26 deletions(-)
arch/ia64/sn/pci/pcibr/pcibr_ate.c +1 -1
index 5eb1e1e..935029f 100644
@@ -126,7 +126,7 @@ int pcibr_ate_alloc(struct pcibus_info *
  * Setup an Address Translation Entry as specified.  Use either the Bridge
  * internal maps or the external map RAM, as appropriate.
  */
-static inline u64 *pcibr_ate_addr(struct pcibus_info *pcibus_info,
+static inline u64 __iomem *pcibr_ate_addr(struct pcibus_info *pcibus_info,
 				       int ate_index)
 {
 	if (ate_index < pcibus_info->pbi_int_ate_size) {
arch/ia64/sn/pci/tioce_provider.c +21 -21

155 lines not on this page · raw message

include/asm-ia64/sn/pcibr_provider.h +1 -1
index e3b0c3f..da3eade 100644
@@ -135,7 +135,7 @@ extern void             pcireg_intr_addr
 extern void             pcireg_force_intr_set(struct pcibus_info *, int);
 extern u64         pcireg_wrb_flush_get(struct pcibus_info *, int);
 extern void             pcireg_int_ate_set(struct pcibus_info *, int, u64);
-extern u64 *	pcireg_int_ate_addr(struct pcibus_info *, int);
+extern u64 __iomem *	pcireg_int_ate_addr(struct pcibus_info *, int);
 extern void 		pcibr_force_interrupt(struct sn_irq_info *sn_irq_info);
 extern void 		pcibr_change_devices_irq(struct sn_irq_info *sn_irq_info);
 extern int 		pcibr_ate_alloc(struct pcibus_info *, int);
include/asm-ia64/sn/tioca_provider.h +2 -2
index 65cdd73..9a820ac 100644
@@ -162,11 +162,11 @@ static inline void
 tioca_tlbflush(struct tioca_kernel *tioca_kernel)
 {
 	volatile u64 tmp;
-	volatile struct tioca *ca_base;
+	volatile struct tioca __iomem *ca_base;
 	struct tioca_common *tioca_common;
 
 	tioca_common = tioca_kernel->ca_common;
-	ca_base = (struct tioca *)tioca_common->ca_common.bs_base;
+	ca_base = (struct tioca __iomem *)tioca_common->ca_common.bs_base;
 
 	/*
 	 * Explicit flushes not needed if GART is in cached mode
include/asm-ia64/sn/tioce_provider.h +1 -1
index 6d62b13..32c32f3 100644
@@ -53,7 +53,7 @@ struct tioce_dmamap {
 	u64		ct_start;	/* coretalk start address */
 	u64		pci_start;	/* bus start address */
 
-	u64		*ate_hw;	/* hw ptr of first ate in map */
+	u64		__iomem *ate_hw;/* hw ptr of first ate in map */
 	u64		*ate_shadow;	/* shadow ptr of firat ate */
 	u16		ate_count;	/* # ate's in the map */
 };
Signature · 1 line
1.4.2.GIT