From 374ee1b6779bf500fac67032528850fdd723d803 Mon Sep 17 00:00:00 2001
From: Richard Kuo <rkuo@codeaurora.org>
Date: Fri, 1 Mar 2013 13:16:15 -0600
Subject: [PATCH] --- yaml --- r: 367953 b: refs/heads/master c:
 1ce81f4f8727f42c052fe814f3df20bc92fdb168 h: refs/heads/master i:   367951:
 07db2e32c1a5fa1a0d676bbf24e3ca81e278e561 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/hexagon/include/asm/io.h | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 509b44eb75bb..d80a8164233d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f167063a0c4e97dfbd8e42df76e71022bb2bdb7f
+refs/heads/master: 1ce81f4f8727f42c052fe814f3df20bc92fdb168
diff --git a/trunk/arch/hexagon/include/asm/io.h b/trunk/arch/hexagon/include/asm/io.h
index e527cfeff5ba..6199ed5f064b 100644
--- a/trunk/arch/hexagon/include/asm/io.h
+++ b/trunk/arch/hexagon/include/asm/io.h
@@ -40,6 +40,8 @@
 #define IO_SPACE_LIMIT 0xffff
 #define _IO_BASE ((void __iomem *)0xfe000000)
 
+#define IOMEM(x)        ((void __force __iomem *)(x))
+
 extern int remap_area_pages(unsigned long start, unsigned long phys_addr,
 				unsigned long end, unsigned long flags);
 
@@ -175,6 +177,18 @@ static inline void writel(u32 data, volatile void __iomem *addr)
 #define __raw_readw readw
 #define __raw_readl readl
 
+/*
+ * http://comments.gmane.org/gmane.linux.ports.arm.kernel/117626
+ */
+
+#define readb_relaxed __raw_readb
+#define readw_relaxed __raw_readw
+#define readl_relaxed __raw_readl
+
+#define writeb_relaxed __raw_writeb
+#define writew_relaxed __raw_writew
+#define writel_relaxed __raw_writel
+
 /*
  * Need an mtype somewhere in here, for cache type deals?
  * This is probably too long for an inline.