summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/io.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-09-24 11:42:06 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-09-24 11:42:06 +0200
commitd2f607484f8210cf19b1730dee26d426a5a770a5 (patch)
treeb05e0376b0843063e14342811dbedc8bf2f4177b /arch/arm/kernel/io.c
parentMerge branch 'upstream' from master.kernel.org:/pub/scm/linux/kernel/git/jgar... (diff)
downloadlinux-d2f607484f8210cf19b1730dee26d426a5a770a5.tar.xz
linux-d2f607484f8210cf19b1730dee26d426a5a770a5.zip
[ARM] Fix compiler warnings for memcpy_toio/memcpy_fromio/memset_io
Add 'volatile' to the __iomem pointers for these functions as per x86. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/io.c')
-rw-r--r--arch/arm/kernel/io.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kernel/io.c b/arch/arm/kernel/io.c
index 6c20c1188b60..1f6822dfae74 100644
--- a/arch/arm/kernel/io.c
+++ b/arch/arm/kernel/io.c
@@ -7,7 +7,7 @@
* Copy data from IO memory space to "real" memory space.
* This needs to be optimized.
*/
-void _memcpy_fromio(void *to, void __iomem *from, size_t count)
+void _memcpy_fromio(void *to, const volatile void __iomem *from, size_t count)
{
unsigned char *t = to;
while (count) {
@@ -22,7 +22,7 @@ void _memcpy_fromio(void *to, void __iomem *from, size_t count)
* Copy data from "real" memory space to IO memory space.
* This needs to be optimized.
*/
-void _memcpy_toio(void __iomem *to, const void *from, size_t count)
+void _memcpy_toio(volatile void __iomem *to, const void *from, size_t count)
{
const unsigned char *f = from;
while (count) {
@@ -37,7 +37,7 @@ void _memcpy_toio(void __iomem *to, const void *from, size_t count)
* "memset" on IO memory space.
* This needs to be optimized.
*/
-void _memset_io(void __iomem *dst, int c, size_t count)
+void _memset_io(volatile void __iomem *dst, int c, size_t count)
{
while (count) {
count--;