Merge git://git.infradead.org/battery-2.6

[pandora-kernel.git] / arch / arm / mm / init.c

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index e591513..3f17ea1 100644 (file)
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -85,7 +85,7 @@ void show_mem(unsigned int filter)
        struct meminfo * mi = &meminfo;
 
        printk("Mem-info:\n");
-       show_free_areas();
+       show_free_areas(filter);
 
        for_each_bank (i, mi) {
                struct membank *bank = &mi->bank[i];
@@ -201,6 +201,20 @@ static void __init arm_bootmem_init(unsigned long start_pfn,
        }
 }
 
+#ifdef CONFIG_ZONE_DMA
+static void __init arm_adjust_dma_zone(unsigned long *size, unsigned long *hole,
+       unsigned long dma_size)
+{
+       if (size[0] <= dma_size)
+               return;
+
+       size[ZONE_NORMAL] = size[0] - dma_size;
+       size[ZONE_DMA] = dma_size;
+       hole[ZONE_NORMAL] = hole[0];
+       hole[ZONE_DMA] = 0;
+}
+#endif
+
 static void __init arm_bootmem_free(unsigned long min, unsigned long max_low,
        unsigned long max_high)
 {
@@ -243,11 +257,18 @@ static void __init arm_bootmem_free(unsigned long min, unsigned long max_low,
 #endif
        }
 
+#ifdef ARM_DMA_ZONE_SIZE
+#ifndef CONFIG_ZONE_DMA
+#error ARM_DMA_ZONE_SIZE set but no DMA zone to limit allocations
+#endif
+
        /*
         * Adjust the sizes according to any special requirements for
         * this machine type.
         */
-       arch_adjust_zones(zone_size, zhole_size);
+       arm_adjust_dma_zone(zone_size, zhole_size,
+               ARM_DMA_ZONE_SIZE >> PAGE_SHIFT);
+#endif
 
        free_area_init_node(0, zone_size, min, zhole_size);
 }