ENGR00158360 imx MSL: fix __arch_adjust_zones function

fix __arch_adjust_zones if MXC_DMA_ZONE_SIZE if bigger than system memory

Signed-off-by: Jason Chen <b02280@freescale.com>

diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h
index 5a17215929004e9620581ffcfee7ee93430bce1d..55b08d9fc7fc655930a4d8df31bb905493eb1c94 100755 (executable)
--- a/arch/arm/plat-mxc/include/mach/memory.h
+++ b/arch/arm/plat-mxc/include/mach/memory.h
@@ -82,11 +82,15 @@
 static inline void __arch_adjust_zones(unsigned long *zone_size,
                unsigned long *zhole_size)
 {
+#ifdef CONFIG_ZONE_DMA
        /* Create separate zone to reserve memory for DMA */
-       zone_size[1] = zone_size[0] - MXC_DMA_ZONE_SIZE;
-       zone_size[0] = MXC_DMA_ZONE_SIZE;
-       zhole_size[1] = zhole_size[0];
-       zhole_size[0] = 0;
+       if ((zone_size[0] - zhole_size[0]) > MXC_DMA_ZONE_SIZE) {
+               zone_size[1] = zone_size[0] - MXC_DMA_ZONE_SIZE;
+               zone_size[0] = MXC_DMA_ZONE_SIZE;
+               zhole_size[1] = zhole_size[0];
+               zhole_size[0] = 0;
+       }
+#endif
 }
 
 #define arch_adjust_zones(size, holes) \