This is for x86_64 to add memory which belongs onlined node.
This patch is just confirmed compile completion.
If there is no objection, I would like to test this.
Signed-off-by: Yasunori Goto <[email protected]>
Index: linux-2.6.15/arch/x86_64/mm/init.c
===================================================================
--- linux-2.6.15.orig/arch/x86_64/mm/init.c 2006-02-06 16:47:41.000000000 +0900
+++ linux-2.6.15/arch/x86_64/mm/init.c 2006-02-06 18:31:52.000000000 +0900
@@ -26,6 +26,7 @@
#include <linux/dma-mapping.h>
#include <linux/module.h>
#include <linux/memory_hotplug.h>
+#include <linux/acpi.h>
#include <asm/processor.h>
#include <asm/system.h>
@@ -494,11 +495,20 @@
int add_memory(u64 start, u64 size)
{
- struct pglist_data *pgdat = NODE_DATA(0);
- struct zone *zone = pgdat->node_zones + MAX_NR_ZONES-2;
+ struct pglist_data *pgdat;
+ struct zone *zone;
unsigned long start_pfn = start >> PAGE_SHIFT;
unsigned long nr_pages = size >> PAGE_SHIFT;
- int ret;
+ int ret, node;
+
+ 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 + MAX_NR_ZONES - 2;
ret = __add_pages(zone, start_pfn, nr_pages);
if (ret)
--
Yasunori Goto