summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2004-11-11 19:35:44 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-11-11 19:35:44 -0800
commit9ba41447b7226301b3db2ef60b0969a7ab619be3 (patch)
treea680a5bce0fcfe96956aefb6fbab583b6d120988
parent5240bcbffe6da1039fe4e13f13be1e7aff5bea55 (diff)
[PATCH] rivafb: stricter memory ordering
The more relaxed memory ordering od the __raw_{write,read}b broke things on ppc in the recent rivafb cleanups. [ Uglyness alert: only the 8-bit accesses are more strongly serialized. The 16- and 32-bit ones have always been relaxed. Gaah. ] Signed-off-by: Guido Guenther <agx@sigxcpu.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/video/riva/riva_hw.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/riva/riva_hw.h b/drivers/video/riva/riva_hw.h
index d635c528c7cb..03335fab8587 100644
--- a/drivers/video/riva/riva_hw.h
+++ b/drivers/video/riva/riva_hw.h
@@ -75,8 +75,8 @@ typedef unsigned int U032;
*/
#include <asm/io.h>
-#define NV_WR08(p,i,d) (__raw_writeb((d), (void __iomem *)(p) + (i)))
-#define NV_RD08(p,i) (__raw_readb((void __iomem *)(p) + (i)))
+#define NV_WR08(p,i,d) (writeb((d), (void __iomem *)(p) + (i)))
+#define NV_RD08(p,i) (readb((void __iomem *)(p) + (i)))
#define NV_WR16(p,i,d) (__raw_writew((d), (void __iomem *)(p) + (i)))
#define NV_RD16(p,i) (__raw_readw((void __iomem *)(p) + (i)))
#define NV_WR32(p,i,d) (__raw_writel((d), (void __iomem *)(p) + (i)))