From b8f87fb867bb332ec639c87561dc37a19044af9e Mon Sep 17 00:00:00 2001
From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Wed, 6 Jun 2012 12:05:01 +0200
Subject: [PATCH] --- yaml --- r: 310939 b: refs/heads/master c:
 4986e5c7cd91817d0f58dd15073c9080d47980cf h: refs/heads/master i:   310937:
 8f280b181e03280201f51511e2933a872d8c2948   310935:
 9b3cecb9382ed1693951f06d359f4158b4ed3448 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/arm/mm/init.c | 2 +-
 trunk/arch/arm/mm/mm.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6ece530e0994..ec8140c6fa4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e53f517ff236a0ec5413ff3935c53406b69bc1e2
+refs/heads/master: 4986e5c7cd91817d0f58dd15073c9080d47980cf
diff --git a/trunk/arch/arm/mm/init.c b/trunk/arch/arm/mm/init.c
index c21d06c7dd7e..f54d59219764 100644
--- a/trunk/arch/arm/mm/init.c
+++ b/trunk/arch/arm/mm/init.c
@@ -212,7 +212,7 @@ EXPORT_SYMBOL(arm_dma_zone_size);
  * allocations.  This must be the smallest DMA mask in the system,
  * so a successful GFP_DMA allocation will always satisfy this.
  */
-u32 arm_dma_limit;
+phys_addr_t arm_dma_limit;
 
 static void __init arm_adjust_dma_zone(unsigned long *size, unsigned long *hole,
 	unsigned long dma_size)
diff --git a/trunk/arch/arm/mm/mm.h b/trunk/arch/arm/mm/mm.h
index 93dc0c17cdcb..c471436c7952 100644
--- a/trunk/arch/arm/mm/mm.h
+++ b/trunk/arch/arm/mm/mm.h
@@ -62,7 +62,7 @@ extern void __flush_dcache_page(struct address_space *mapping, struct page *page
 #endif
 
 #ifdef CONFIG_ZONE_DMA
-extern u32 arm_dma_limit;
+extern phys_addr_t arm_dma_limit;
 #else
 #define arm_dma_limit ((u32)~0)
 #endif