* [PATCH] arm/rpc iomem annotations
@ 2005-09-28 23:10 Al Viro
2005-09-29 17:00 ` Russell King
0 siblings, 1 reply; 2+ messages in thread
From: Al Viro @ 2005-09-28 23:10 UTC (permalink / raw)
To: Linus Torvalds; +Cc: rmk, linux-kernel
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
----
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)
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] arm/rpc iomem annotations
2005-09-28 23:10 [PATCH] arm/rpc iomem annotations Al Viro
@ 2005-09-29 17:00 ` Russell King
0 siblings, 0 replies; 2+ messages in thread
From: Russell King @ 2005-09-29 17:00 UTC (permalink / raw)
To: Al Viro; +Cc: Linus Torvalds, linux-kernel
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-09-29 17:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-09-28 23:10 [PATCH] arm/rpc iomem annotations Al Viro
2005-09-29 17:00 ` Russell King
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox