Skip to contentSkip to conversation

arm/rpc iomem annotations

PATCH In review Al Viro 2 participants 2 messages Sep 28, 2005 – Sep 29, 2005

lore
Share & tools
lore

Al Viro

author
#0 lore raw

PATCH 1/1 arm/rpc iomem annotations

----

include/asm-arm/arch-rpc/hardware.h +2 -2
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
@@ -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)
Acked-by on v1 1/1
#1 lore raw
include/asm-arm/arch-rpc/hardware.h +2 -2
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
@@ -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)
Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core