Pull sony into release branch

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

diff --git a/arch/sh64/mm/init.c b/arch/sh64/mm/init.c
index 1169757..5dc0878 100644 (file)
--- a/arch/sh64/mm/init.c
+++ b/arch/sh64/mm/init.c
@@ -110,7 +110,7 @@ void show_mem(void)
  */
 void __init paging_init(void)
 {
-       unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
+       unsigned long zones_size[MAX_NR_ZONES] = {0, };
 
        pgd_init((unsigned long)swapper_pg_dir);
        pgd_init((unsigned long)swapper_pg_dir +
@@ -118,10 +118,7 @@ void __init paging_init(void)
 
        mmu_context_cache = MMU_CONTEXT_FIRST_VERSION;
 
-        /*
-        * All memory is good as ZONE_NORMAL (fall-through) and ZONE_DMA.
-         */
-       zones_size[ZONE_DMA] = MAX_LOW_PFN - START_PFN;
+       zones_size[ZONE_NORMAL] = MAX_LOW_PFN - START_PFN;
        NODE_DATA(0)->node_mem_map = NULL;
        free_area_init_node(0, NODE_DATA(0), zones_size, __MEMORY_START >> PAGE_SHIFT, 0);
 }