This is for ia64 to add memory which belongs onlined node.
Signed-off-by: Yasunori Goto <[email protected]>
Index: node_add2/arch/ia64/mm/init.c
===================================================================
--- node_add2.orig/arch/ia64/mm/init.c 2006-02-03 20:51:48.000000000 +0900
+++ node_add2/arch/ia64/mm/init.c 2006-02-03 21:39:21.000000000 +0900
@@ -20,6 +20,7 @@
#include <linux/swap.h>
#include <linux/proc_fs.h>
#include <linux/bitops.h>
+#include <linux/acpi.h>
#include <asm/a.out.h>
#include <asm/dma.h>
@@ -652,9 +653,15 @@ int add_memory(u64 start, u64 size)
struct zone *zone;
unsigned long start_pfn = start >> PAGE_SHIFT;
unsigned long nr_pages = size >> PAGE_SHIFT;
- int ret;
+ int ret, node;
- pgdat = NODE_DATA(0);
+ node = acpi_paddr_to_node(start, size);
+
+ if (node >= 0 && node_online(node))
+ pgdat = NODE_DATA(node);
+ else
+ /* New node's memory will be added to Node 0 temporally. */
+ pgdat = NODE_DATA(0);
zone = pgdat->node_zones + ZONE_NORMAL;
ret = __add_pages(zone, start_pfn, nr_pages);
--
Yasunori Goto