summaryrefslogtreecommitdiffstats
path: root/include/asm-arm
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-10-14 19:36:00 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-14 12:41:52 -0700
commitc6b44e50b8958d9bfe3003c81e70d9a53852ae52 (patch)
tree0a1c6194f13708805c708a015b6a9f9e0d6ab2ae /include/asm-arm
parent5ba253313d014364a9b87b6fa975ce2fc9759aa6 (diff)
downloadkernel-crypto-c6b44e50b8958d9bfe3003c81e70d9a53852ae52.tar.gz
kernel-crypto-c6b44e50b8958d9bfe3003c81e70d9a53852ae52.tar.xz
kernel-crypto-c6b44e50b8958d9bfe3003c81e70d9a53852ae52.zip
endianness annotations in arm io.h
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-arm')
-rw-r--r--include/asm-arm/io.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h
index 1d3caa42a38..eebe56e74d6 100644
--- a/include/asm-arm/io.h
+++ b/include/asm-arm/io.h
@@ -228,12 +228,12 @@ extern void _memset_io(volatile void __iomem *, int, size_t);
*/
#ifndef ioread8
#define ioread8(p) ({ unsigned int __v = __raw_readb(p); __v; })
-#define ioread16(p) ({ unsigned int __v = le16_to_cpu(__raw_readw(p)); __v; })
-#define ioread32(p) ({ unsigned int __v = le32_to_cpu(__raw_readl(p)); __v; })
+#define ioread16(p) ({ unsigned int __v = le16_to_cpu((__force __le16)__raw_readw(p)); __v; })
+#define ioread32(p) ({ unsigned int __v = le32_to_cpu((__force __le32)__raw_readl(p)); __v; })
#define iowrite8(v,p) __raw_writeb(v, p)
-#define iowrite16(v,p) __raw_writew(cpu_to_le16(v), p)
-#define iowrite32(v,p) __raw_writel(cpu_to_le32(v), p)
+#define iowrite16(v,p) __raw_writew((__force __u16)cpu_to_le16(v), p)
+#define iowrite32(v,p) __raw_writel((__force __u32)cpu_to_le32(v), p)
#define ioread8_rep(p,d,c) __raw_readsb(p,d,c)
#define ioread16_rep(p,d,c) __raw_readsw(p,d,c)