2005-09-28 23:10:07

by Al Viro

Subject: [PATCH] arm/rpc iomem annotations

Signed-off-by: Al Viro <[email protected]>
----
diff -urN RC14-rc2-git6-ia64-user/include/asm-arm/arch-rpc/hardware.h RC14-rc2-git6-rpc-iomem/include/asm-arm/arch-rpc/hardware.h
--- RC14-rc2-git6-ia64-user/include/asm-arm/arch-rpc/hardware.h 2005-06-17 15:48:29.000000000 -0400
+++ RC14-rc2-git6-rpc-iomem/include/asm-arm/arch-rpc/hardware.h 2005-09-28 13:02:05.000000000 -0400
@@ -15,7 +15,7 @@
#include <asm/arch/memory.h>

#ifndef __ASSEMBLY__
-#define IOMEM(x) ((void __iomem *)(x))
+#define IOMEM(x) ((void __iomem *)(unsigned long)(x))
#else
#define IOMEM(x) x
#endif /* __ASSEMBLY__ */
@@ -52,7 +52,7 @@
/*
* IO Addresses
*/
-#define VIDC_BASE (void __iomem *)0xe0400000
+#define VIDC_BASE IOMEM(0xe0400000)
#define EXPMASK_BASE 0xe0360000
#define IOMD_BASE IOMEM(0xe0200000)
#define IOC_BASE IOMEM(0xe0200000)

2005-09-29 17:00:23

by Russell King

Subject: Re: [PATCH] arm/rpc iomem annotations

Signed-off-by: Al Viro <[email protected]>
Acked-by: Russell King <[email protected]>

diff -urN RC14-rc2-git6-ia64-user/include/asm-arm/arch-rpc/hardware.h RC14-rc2-git6-rpc-iomem/include/asm-arm/arch-rpc/hardware.h
--- RC14-rc2-git6-ia64-user/include/asm-arm/arch-rpc/hardware.h 2005-06-17 15:48:29.000000000 -0400
+++ RC14-rc2-git6-rpc-iomem/include/asm-arm/arch-rpc/hardware.h 2005-09-28 13:02:05.000000000 -0400
@@ -15,7 +15,7 @@
#include <asm/arch/memory.h>

#ifndef __ASSEMBLY__
-#define IOMEM(x) ((void __iomem *)(x))
+#define IOMEM(x) ((void __iomem *)(unsigned long)(x))
#else
#define IOMEM(x) x
#endif /* __ASSEMBLY__ */
@@ -52,7 +52,7 @@
/*
* IO Addresses
*/
-#define VIDC_BASE (void __iomem *)0xe0400000
+#define VIDC_BASE IOMEM(0xe0400000)
#define EXPMASK_BASE 0xe0360000
#define IOMD_BASE IOMEM(0xe0200000)
#define IOC_BASE IOMEM(0xe0200000)

--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 Serial core