Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6-omap-h63xx.git] / include / asm-ia64 / sn / tioca_provider.h

diff --git a/include/asm-ia64/sn/tioca_provider.h b/include/asm-ia64/sn/tioca_provider.h
index 65cdd73c2a57a641e3c32461f55053c04c1c16da..9a820ac61be338347f23d5d939e009bce8d52a7d 100644 (file)
--- a/include/asm-ia64/sn/tioca_provider.h
+++ b/include/asm-ia64/sn/tioca_provider.h
@@ -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