From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 5 Jul 2012 12:11:31 +0000 (+0100)
Subject: ARM: fix warning caused by wrongly typed arm_dma_limit
X-Git-Tag: firefly_0821_release~3680^2~2507^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=09b2ad13da3ac7c717dd86bfca7072d9b36f7449;p=firefly-linux-kernel-4.4.55.git

ARM: fix warning caused by wrongly typed arm_dma_limit

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

diff --git a/arch/arm/mm/mm.h b/arch/arm/mm/mm.h
index c471436c7952..2e8a1efdf7b8 100644
--- a/arch/arm/mm/mm.h
+++ b/arch/arm/mm/mm.h
@@ -64,7 +64,7 @@ extern void __flush_dcache_page(struct address_space *mapping, struct page *page
 #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;