[PATCH 2.6.9-rc1-mm4 2/6] [m32r] Update zone_sizes_init()

From: Hirokazu Takata
Date: Sat Sep 11 2004 - 15:49:29 EST


[PATCH 2.6.9-rc1-mm4 2/6] [m32r] Update zone_sizes_init()
This patch upgrades zone_sizes_init() function.
This patch is required because free_area_init_node()'s interface
has been changed.

* arch/m32r/mm/discontig.c (zone_sizes_init):
Change free_area_init_node() interface.

* arch/m32r/mm/init.c: ditto.

Signed-off-by: Hirokazu Takata <takata@xxxxxxxxxxxxxx>
---

arch/m32r/mm/discontig.c | 2 +-
arch/m32r/mm/init.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)


diff -ruNp linux-2.6.9-rc1-mm4.orig/arch/m32r/mm/discontig.c linux-2.6.9-rc1-mm4/arch/m32r/mm/discontig.c
--- linux-2.6.9-rc1-mm4.orig/arch/m32r/mm/discontig.c 2004-09-08 08:14:03.000000000 +0900
+++ linux-2.6.9-rc1-mm4/arch/m32r/mm/discontig.c 2004-09-09 01:47:12.000000000 +0900
@@ -152,7 +152,7 @@ unsigned long __init zone_sizes_init(voi
zholes_size[ZONE_DMA] = mp->holes;
holes += zholes_size[ZONE_DMA];

- free_area_init_node(nid, NODE_DATA(nid), NULL, zones_size,
+ free_area_init_node(nid, NODE_DATA(nid), zones_size,
start_pfn, zholes_size);
}

diff -ruNp linux-2.6.9-rc1-mm4.orig/arch/m32r/mm/init.c linux-2.6.9-rc1-mm4/arch/m32r/mm/init.c
--- linux-2.6.9-rc1-mm4.orig/arch/m32r/mm/init.c 2004-09-08 08:14:03.000000000 +0900
+++ linux-2.6.9-rc1-mm4/arch/m32r/mm/init.c 2004-09-09 01:39:58.000000000 +0900
@@ -120,8 +120,7 @@ unsigned long __init zone_sizes_init(voi
start_pfn = __MEMORY_START >> PAGE_SHIFT;
#endif /* CONFIG_MMU */

- free_area_init_node(0, NODE_DATA(0), 0, zones_size,
- start_pfn, 0);
+ free_area_init_node(0, NODE_DATA(0), zones_size, start_pfn, 0);

mem_map = contig_page_data.node_mem_map;

--
Hirokazu Takata <takata@xxxxxxxxxxxxxx>
Linux/M32R Project: http://www.linux-m32r.org/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/