summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-07-05 13:11:31 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-07-05 13:11:31 +0100
commit09b2ad13da3ac7c717dd86bfca7072d9b36f7449 (patch)
treea526cf0f082a40a7f9b9a784136afb1eb8e85385
parentb89d607b590397c04b63d94a9e2fca9649917955 (diff)
downloadlinux-09b2ad13da3ac7c717dd86bfca7072d9b36f7449.tar.gz
linux-09b2ad13da3ac7c717dd86bfca7072d9b36f7449.tar.bz2
linux-09b2ad13da3ac7c717dd86bfca7072d9b36f7449.zip
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>
-rw-r--r--arch/arm/mm/mm.h2
1 files changed, 1 insertions, 1 deletions
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;