This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / asm-ia64 / machvec.h

diff --git a/include/asm-ia64/machvec.h b/include/asm-ia64/machvec.h
index 0749f1a..ff881e2 100644 (file)
--- a/include/asm-ia64/machvec.h
+++ b/include/asm-ia64/machvec.h
@@ -62,15 +62,14 @@ typedef unsigned int ia64_mv_inl_t (unsigned long);
 typedef void ia64_mv_outb_t (unsigned char, unsigned long);
 typedef void ia64_mv_outw_t (unsigned short, unsigned long);
 typedef void ia64_mv_outl_t (unsigned int, unsigned long);
-typedef void ia64_mv_mmiowb_t (void);
-typedef unsigned char ia64_mv_readb_t (const volatile void __iomem *);
-typedef unsigned short ia64_mv_readw_t (const volatile void __iomem *);
-typedef unsigned int ia64_mv_readl_t (const volatile void __iomem *);
-typedef unsigned long ia64_mv_readq_t (const volatile void __iomem *);
-typedef unsigned char ia64_mv_readb_relaxed_t (const volatile void __iomem *);
-typedef unsigned short ia64_mv_readw_relaxed_t (const volatile void __iomem *);
-typedef unsigned int ia64_mv_readl_relaxed_t (const volatile void __iomem *);
-typedef unsigned long ia64_mv_readq_relaxed_t (const volatile void __iomem *);
+typedef unsigned char ia64_mv_readb_t (void *);
+typedef unsigned short ia64_mv_readw_t (void *);
+typedef unsigned int ia64_mv_readl_t (void *);
+typedef unsigned long ia64_mv_readq_t (void *);
+typedef unsigned char ia64_mv_readb_relaxed_t (void *);
+typedef unsigned short ia64_mv_readw_relaxed_t (void *);
+typedef unsigned int ia64_mv_readl_relaxed_t (void *);
+typedef unsigned long ia64_mv_readq_relaxed_t (void *);
 
 static inline void
 machvec_noop (void)
@@ -131,7 +130,6 @@ extern void machvec_tlb_migrate_finish (struct mm_struct *);
 #  define platform_outb                ia64_mv.outb
 #  define platform_outw                ia64_mv.outw
 #  define platform_outl                ia64_mv.outl
-#  define platform_mmiowb      ia64_mv.mmiowb
 #  define platform_readb        ia64_mv.readb
 #  define platform_readw        ia64_mv.readw
 #  define platform_readl        ia64_mv.readl
@@ -178,7 +176,6 @@ struct ia64_machine_vector {
        ia64_mv_outb_t *outb;
        ia64_mv_outw_t *outw;
        ia64_mv_outl_t *outl;
-       ia64_mv_mmiowb_t *mmiowb;
        ia64_mv_readb_t *readb;
        ia64_mv_readw_t *readw;
        ia64_mv_readl_t *readl;
@@ -221,7 +218,6 @@ struct ia64_machine_vector {
        platform_outb,                          \
        platform_outw,                          \
        platform_outl,                          \
-       platform_mmiowb,                        \
        platform_readb,                         \
        platform_readw,                         \
        platform_readl,                         \
@@ -348,9 +344,6 @@ extern ia64_mv_dma_supported                swiotlb_dma_supported;
 #ifndef platform_outl
 # define platform_outl         __ia64_outl
 #endif
-#ifndef platform_mmiowb
-# define platform_mmiowb       __ia64_mmiowb
-#endif
 #ifndef platform_readb
 # define platform_readb                __ia64_readb
 #endif