[RFC][PATCH] avoid creating empty nodes [1/2] move reserve memory before parsing acpi

From: KAMEZAWA Hiroyuki <kamezawa.hiroyu_at_jp.fujitsu.com>
Date: 2006-03-29 13:11:14
move callers of reserve_memory() to use efi_memmap_walk
in acpi_numa_fixup().

Signed-Off-By: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>

Index: linux-2.6.16-mm1/arch/ia64/kernel/setup.c
===================================================================
--- linux-2.6.16-mm1.orig/arch/ia64/kernel/setup.c	2006-03-28 11:16:13.000000000 +0900
+++ linux-2.6.16-mm1/arch/ia64/kernel/setup.c	2006-03-28 15:20:52.000000000 +0900
@@ -431,6 +431,8 @@
 		mark_bsp_online();
 
 	parse_early_param();
+
+	reserve_memory();
 #ifdef CONFIG_ACPI
 	/* Initialize the ACPI boot-time table parser */
 	acpi_table_init();
Index: linux-2.6.16-mm1/arch/ia64/mm/contig.c
===================================================================
--- linux-2.6.16-mm1.orig/arch/ia64/mm/contig.c	2006-03-28 11:16:13.000000000 +0900
+++ linux-2.6.16-mm1/arch/ia64/mm/contig.c	2006-03-28 15:20:52.000000000 +0900
@@ -146,8 +146,6 @@
 {
 	unsigned long bootmap_size;
 
-	reserve_memory();
-
 	/* first find highest page frame number */
 	max_pfn = 0;
 	efi_memmap_walk(find_max_pfn, &max_pfn);
Index: linux-2.6.16-mm1/arch/ia64/mm/discontig.c
===================================================================
--- linux-2.6.16-mm1.orig/arch/ia64/mm/discontig.c	2006-03-28 11:16:13.000000000 +0900
+++ linux-2.6.16-mm1/arch/ia64/mm/discontig.c	2006-03-28 15:20:52.000000000 +0900
@@ -438,8 +438,6 @@
 {
 	int node;
 
-	reserve_memory();
-
 	if (num_online_nodes() == 0) {
 		printk(KERN_ERR "node info missing!\n");
 		node_set_online(0);
-
To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Received on Wed Mar 29 13:55:31 2006

This archive was generated by hypermail 2.1.8 : 2006-03-29 13:55:41 EST