---

yaml --- r: 310939 b: refs/heads/master c: 4986e5c h: refs/heads/master i: 310937: 8f280b1 310935: 9b3cecb v: v3
git-mirror · Jun 11, 2012 · b8f87fb · b8f87fb
1 parent 381fb74
commit b8f87fb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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