[PATCH] Missing free_area_init_node() conversions

Update architectures for the free_area_init_node() API change.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/arm26/mm/init.c b/arch/arm26/mm/init.c
index ad41cebe207a98001e587d7c1a45beda521b030d..ae5ced10d987df785670d20d74c07fa4c0e65238 100644 (file)
--- a/arch/arm26/mm/init.c
+++ b/arch/arm26/mm/init.c
@@ -305,8 +305,8 @@ void __init paging_init(struct meminfo *mi)
                        (bdata->node_boot_start >> PAGE_SHIFT);
        if (!zone_size[0])
                BUG();
-
-       free_area_init_node(0, pgdat, 0, zone_size,
+       pgdat->node_mem_map = NULL;
+       free_area_init_node(0, pgdat, zone_size,
                        bdata->node_boot_start >> PAGE_SHIFT, zhole_size);
 
        mem_map = NODE_DATA(0)->node_mem_map;

diff --git a/arch/cris/arch-v10/mm/init.c b/arch/cris/arch-v10/mm/init.c
index df03dea5bae4bfb69094e8bbf5d46abf046fc0fe..720b9c1561ddcd64c0c6e46462a6f7b8793df349 100644 (file)
--- a/arch/cris/arch-v10/mm/init.c
+++ b/arch/cris/arch-v10/mm/init.c
@@ -183,7 +183,7 @@ paging_init(void)
         * mem_map page array.
         */
 
-       free_area_init_node(0, &contig_page_data, 0, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0);
+       free_area_init_node(0, &contig_page_data, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0);
        mem_map = contig_page_data.node_mem_map;
 }
 

diff --git a/arch/ppc64/mm/numa.c b/arch/ppc64/mm/numa.c
index eb33136944c4032be721c6bacc54617db9c0ec54..ffc44e4ab6ab6f412510aa86bbc32ee809844588 100644 (file)
--- a/arch/ppc64/mm/numa.c
+++ b/arch/ppc64/mm/numa.c
@@ -442,7 +442,6 @@ void __init paging_init(void)
 {
        unsigned long zones_size[MAX_NR_ZONES];
        unsigned long zholes_size[MAX_NR_ZONES];
-       struct page *node_mem_map; 
        int nid;
 
        memset(zones_size, 0, sizeof(zones_size));
@@ -469,11 +468,11 @@ void __init paging_init(void)
                 * in free_area_init_node (which will fail).
                 */
                if (!node_data[nid].node_spanned_pages)
-                       node_mem_map = alloc_bootmem(sizeof(struct page));
+                       NODE_DATA(nid)->node_mem_map
+                                       = alloc_bootmem(sizeof(struct page));
                else
-                       node_mem_map = NULL;
-
-               free_area_init_node(nid, NODE_DATA(nid), node_mem_map,
-                                   zones_size, start_pfn, zholes_size);
+                       NODE_DATA(nid)->node_mem_map = NULL;
+               free_area_init_node(nid, NODE_DATA(nid), zones_size,
+                                                       start_pfn, zholes_size);
        }
 }

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 732dcf1a6118c57a701b3bd7480abe9ff59a34d9..030008e1fd6c00192f8abd3db05119920d8aff92 100644 (file)
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -214,8 +214,8 @@ void __init paging_init(void)
         */
        disable_mmu();
 #endif
-
-       free_area_init_node(0, NODE_DATA(0), 0, zones_size, __MEMORY_START >> PAGE_SHIFT, 0);
+       NODE_DATA(0)->node_mem_map = NULL;
+       free_area_init_node(0, NODE_DATA(0), zones_size, __MEMORY_START >> PAGE_SHIFT, 0);
        /* XXX: MRB-remove - this doesn't seem sane, should this be done somewhere else ?*/
        mem_map = NODE_DATA(0)->node_mem_map;
 

diff --git a/arch/sh64/mm/init.c b/arch/sh64/mm/init.c
index 17cdeb425e0585969be125304f4dc0a1411dd8b5..09cd9c87907e8fe7db41b69cc2de574e76b53a4e 100644 (file)
--- a/arch/sh64/mm/init.c
+++ b/arch/sh64/mm/init.c
@@ -122,8 +122,8 @@ void __init paging_init(void)
         * All memory is good as ZONE_NORMAL (fall-through) and ZONE_DMA.
          */
        zones_size[ZONE_DMA] = MAX_LOW_PFN - START_PFN;
-
-       free_area_init_node(0, NODE_DATA(0), 0, zones_size, __MEMORY_START >> PAGE_SHIFT, 0);
+       NODE_DATA(0)->node_mem_map = NULL;
+       free_area_init_node(0, NODE_DATA(0), zones_size, __MEMORY_START >> PAGE_SHIFT, 0);
 
        /* XXX: MRB-remove - this doesn't seem sane, should this be done somewhere else ?*/
        mem_map = NODE_DATA(0)->node_mem_map;

diff --git a/arch/v850/kernel/setup.c b/arch/v850/kernel/setup.c
index 8e8bf5ddc58318b5b2e93e21d9d700d60d8be048..dacc9b33145b12d222b59a03ed163f857f601189 100644 (file)
--- a/arch/v850/kernel/setup.c
+++ b/arch/v850/kernel/setup.c
@@ -280,8 +280,8 @@ init_mem_alloc (unsigned long ram_start, unsigned long ram_len)
 #if ((PAGE_OFFSET >> PAGE_SHIFT) & ((1UL << (MAX_ORDER - 1)) - 1))
 #error MAX_ORDER is too large for given PAGE_OFFSET (use CONFIG_FORCE_MAX_ZONEORDER to change it)
 #endif
-
-       free_area_init_node (0, NODE_DATA(0), 0, zones_size,
+       NODE_DATA(0)->node_mem_map = NULL;
+       free_area_init_node (0, NODE_DATA(0), zones_size,
                             ADDR_TO_PAGE (PAGE_OFFSET), 0);
        mem_map = NODE_DATA(0)->node_mem_map;
 }