[PATCH] fix readX_relaxed machine vectors for ia64

From: jbarnes@sgi.com (Jesse Barnes)

I left out some of the necessary machine vector magic in my readX_relaxed
patch, which broke the ia64 generic build.

diff --git a/arch/ia64/lib/io.c b/arch/ia64/lib/io.c
index 9834646d3d5013fe6d7278b4d53804490b6f5e22..abdb6ba061480a4fe7cb59c7ab76df4926dfe73d 100644 (file)
--- a/arch/ia64/lib/io.c
+++ b/arch/ia64/lib/io.c
@@ -65,6 +65,10 @@ EXPORT_SYMBOL(__ia64_memset_c_io);
 #undef __ia64_readw
 #undef __ia64_readl
 #undef __ia64_readq
+#undef __ia64_readb_relaxed
+#undef __ia64_readw_relaxed
+#undef __ia64_readl_relaxed
+#undef __ia64_readq_relaxed
 #undef __ia64_writeb
 #undef __ia64_writew
 #undef __ia64_writel
@@ -130,4 +134,28 @@ __ia64_readq (void *addr)
        return ___ia64_readq (addr);
 }
 
+unsigned char
+__ia64_readb_relaxed (void *addr)
+{
+       return ___ia64_readb (addr);
+}
+
+unsigned short
+__ia64_readw_relaxed (void *addr)
+{
+       return ___ia64_readw (addr);
+}
+
+unsigned int
+__ia64_readl_relaxed (void *addr)
+{
+       return ___ia64_readl (addr);
+}
+
+unsigned long
+__ia64_readq_relaxed (void *addr)
+{
+       return ___ia64_readq (addr);
+}
+
 #endif /* CONFIG_IA64_GENERIC */

diff --git a/include/asm-ia64/machvec_init.h b/include/asm-ia64/machvec_init.h
index c90ecf86737d12b3e7fd88370324e0f7d2d0c1f3..115a76a125d2e038c3fa32d2dfdf0afaf6aefc81 100644 (file)
--- a/include/asm-ia64/machvec_init.h
+++ b/include/asm-ia64/machvec_init.h
@@ -16,6 +16,10 @@ extern ia64_mv_readb_t __ia64_readb;
 extern ia64_mv_readw_t __ia64_readw;
 extern ia64_mv_readl_t __ia64_readl;
 extern ia64_mv_readq_t __ia64_readq;
+extern ia64_mv_readb_t __ia64_readb_relaxed;
+extern ia64_mv_readw_t __ia64_readw_relaxed;
+extern ia64_mv_readl_t __ia64_readl_relaxed;
+extern ia64_mv_readq_t __ia64_readq_relaxed;
 
 #define MACHVEC_HELPER(name)                                                                   \
  struct ia64_machine_vector machvec_##name __attribute__ ((unused, __section__ (".machvec")))  \