summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2011-01-25 11:18:25 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-01-25 21:18:03 +0000
commit05b112ff98070dc1f3293e8cd8e4c6f468d1084a (patch)
tree18b5ddfc985a96c637e59ff3e5ce4672c277ff58 /arch
parent03399c1cb4e2503e92d10c1ce38ac2e69b7d2380 (diff)
downloadop-kernel-dev-05b112ff98070dc1f3293e8cd8e4c6f468d1084a.zip
op-kernel-dev-05b112ff98070dc1f3293e8cd8e4c6f468d1084a.tar.gz
ARM: 6637/1: Make the argument to virt_to_phys() "const volatile"
Changing the virt_to_phys() argument to "const volatile void *" avoids compiler warnings in some situations where this function is used. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: Stephen Boyd <sboyd@codeaurora.org> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/include/asm/memory.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index 23c2e8e..d0ee74b 100644
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@ -188,7 +188,7 @@
* translation for translating DMA addresses. Use the driver
* DMA support - see dma-mapping.h.
*/
-static inline unsigned long virt_to_phys(void *x)
+static inline unsigned long virt_to_phys(const volatile void *x)
{
return __virt_to_phys((unsigned long)(x));
}
OpenPOWER on IntegriCloud