From 92db8627b6edc573d238e4e67f13fe99c0aa4020 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 7 Feb 2013 14:58:35 +0100 Subject: [PATCH] --- yaml --- r: 359131 b: refs/heads/master c: 711e5b4520986380700e6f095608021cf087170e h: refs/heads/master i: 359129: e81cb20dca32d9d0014543ba968a13e602db819e 359127: 75065fbe6a12e292b22792e23da1bdfd08ebb90d v: v3 --- [refs] | 2 +- trunk/include/asm-generic/io.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e6f626c3d0c6..a2b112b19cec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d64af918feb6cb81c396d6d2dabb738bc51dda3f +refs/heads/master: 711e5b4520986380700e6f095608021cf087170e diff --git a/trunk/include/asm-generic/io.h b/trunk/include/asm-generic/io.h index 33bbbae4ddc6..8823581cf1cd 100644 --- a/trunk/include/asm-generic/io.h +++ b/trunk/include/asm-generic/io.h @@ -225,15 +225,15 @@ static inline void outsl(unsigned long addr, const void *buffer, int count) #ifndef CONFIG_GENERIC_IOMAP #define ioread8(addr) readb(addr) #define ioread16(addr) readw(addr) -#define ioread16be(addr) be16_to_cpu(ioread16(addr)) +#define ioread16be(addr) __be16_to_cpu(__raw_readw(addr)) #define ioread32(addr) readl(addr) -#define ioread32be(addr) be32_to_cpu(ioread32(addr)) +#define ioread32be(addr) __be32_to_cpu(__raw_readl(addr)) #define iowrite8(v, addr) writeb((v), (addr)) #define iowrite16(v, addr) writew((v), (addr)) -#define iowrite16be(v, addr) iowrite16(be16_to_cpu(v), (addr)) +#define iowrite16be(v, addr) __raw_writew(__cpu_to_be16(v), addr) #define iowrite32(v, addr) writel((v), (addr)) -#define iowrite32be(v, addr) iowrite32(be32_to_cpu(v), (addr)) +#define iowrite32be(v, addr) __raw_writel(__cpu_to_be32(v), addr) #define ioread8_rep(p, dst, count) \ insb((unsigned long) (p), (dst), (count))