]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ARM: 6637/1: Make the argument to virt_to_phys() "const volatile"
authorCatalin Marinas <catalin.marinas@arm.com>
Tue, 25 Jan 2011 10:18:25 +0000 (11:18 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 25 Jan 2011 21:18:03 +0000 (21:18 +0000)
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>
arch/arm/include/asm/memory.h

index 23c2e8e5c0faaa09d81910456d4de63a96a513da..d0ee74b7cf86bc2627cc9e7ebf3bdbd7c63400cb 100644 (file)
  * 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));
 }