From: Catalin Marinas <catalin.marinas@arm.com>
Date: Tue, 25 Jan 2011 10:18:25 +0000 (+0100)
Subject: ARM: 6637/1: Make the argument to virt_to_phys() "const volatile"
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=05b112ff98070dc1f3293e8cd8e4c6f468d1084a;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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>
---

diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index 23c2e8e5c0fa..d0ee74b7cf86 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));
 }