blob: 524265fb2155762e5882ef84890fc856b2a9118a [file] [log] [blame]
From dhobsong@igel.co.jp Mon Oct 29 00:53:52 2012
From: Damian Hobson-Garcia <dhobsong@igel.co.jp>
Date: Mon, 29 Oct 2012 16:51:06 +0900
Subject: [PATCH v2 49/58] ARM: fix warning caused by wrongly typed arm_dma_limit
To: greg@kroah.com, laurent.pinchart@ideasonboard.com, horms@verge.net.au
Cc: ltsi-dev@lists.linuxfoundation.org, dhobsong@igel.co.jp
Message-ID: <1351497075-32717-50-git-send-email-dhobsong@igel.co.jp>
From: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mm/init.c: In function 'arm_memblock_init':
arch/arm/mm/init.c:380: warning: comparison of distinct pointer types lacks a cast
by fixing the typecast in its definition when DMA_ZONE is disabled.
This was missed in 4986e5c7c (ARM: mm: fix type of the arm_dma_limit
global variable).
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
(cherry picked from commit 09b2ad13da3ac7c717dd86bfca7072d9b36f7449)
Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>
---
arch/arm/mm/mm.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/arm/mm/mm.h
+++ b/arch/arm/mm/mm.h
@@ -70,7 +70,7 @@ extern void __flush_dcache_page(struct a
#ifdef CONFIG_ZONE_DMA
extern phys_addr_t arm_dma_limit;
#else
-#define arm_dma_limit ((u32)~0)
+#define arm_dma_limit ((phys_addr_t)~0)
#endif
extern phys_addr_t arm_lowmem_limit;