---

yaml --- r: 339182 b: refs/heads/master c: 938edf5 h: refs/heads/master v: v3
git-mirror · Nov 14, 2012 · 280ceb1 · 280ceb1
1 parent d6462fe
commit 280ceb1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3495386b107510ba7014f42da37034648c1d2cfd
+refs/heads/master: 938edf5c04202b59b8ff01a4033e9413646b105b
diff --git a/trunk/arch/arm64/mm/init.c b/trunk/arch/arm64/mm/init.c
@@ -79,8 +79,8 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max)
 
 #ifdef CONFIG_ZONE_DMA32
 	/* 4GB maximum for 32-bit only capable devices */
-	max_dma32 = min(max, MAX_DMA32_PFN);
-	zone_size[ZONE_DMA32] = max(min, max_dma32) - min;
+	max_dma32 = max(min, min(max, MAX_DMA32_PFN));
+	zone_size[ZONE_DMA32] = max_dma32 - min;
 #endif
 	zone_size[ZONE_NORMAL] = max - max_dma32;