diff options
| author | Keith Mannthey <kmannth@us.ibm.com> | 2006-09-30 23:27:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 00:39:18 -0700 |
| commit | 8c2676a5870ab15cbeea9f826266bc946fe3cc26 (patch) | |
| tree | 0df06fce24312d7f2d1120d984dd7ae258cb40ef | |
| parent | 4942e998b40b8f6080930ec16442444e9930aee5 (diff) | |
| download | linux-8c2676a5870ab15cbeea9f826266bc946fe3cc26.tar.bz2 | |
[PATCH] hot-add-mem x86_64: memory_add_physaddr_to_nid node fixup
In cases where the acpi memory-add event does not containe the pxm (node)
infomation allow the driver to look up node info based on the address. The
acpi_get_node call returns -1 if it can't decode the pxm info, this causes
add_memory to panic. acpi_get_node would have to decode the resource from the
handle (a lenghty proposition). This seems to be the cleanist point to
interject the hook.
[kamezawa.hiroyu@jp.fujitsu.com: build fixes]
[y-goto@jp.fujitsu.com: build fixes]
Signed-off-by: Keith Mannthey <kmannth@us.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/ia64/mm/numa.c | 18 | ||||
| -rw-r--r-- | arch/x86_64/mm/init.c | 1 | ||||
| -rw-r--r-- | arch/x86_64/mm/srat.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/acpi_memhotplug.c | 4 |
4 files changed, 25 insertions, 0 deletions
diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c index 64e4c21f311c..7807fc5c0422 100644 --- a/arch/ia64/mm/numa.c +++ b/arch/ia64/mm/numa.c @@ -16,6 +16,7 @@ #include <linux/node.h> #include <linux/init.h> #include <linux/bootmem.h> +#include <linux/module.h> #include <asm/mmzone.h> #include <asm/numa.h> @@ -69,4 +70,21 @@ int early_pfn_to_nid(unsigned long pfn) return 0; } + +#ifdef CONFIG_MEMORY_HOTPLUG +/* + * SRAT information is stored in node_memblk[], then we can use SRAT + * information at memory-hot-add if necessary. + */ + +int memory_add_physaddr_to_nid(u64 addr) +{ + int nid = paddr_to_nid(addr); + if (nid < 0) + return 0; + return nid; +} + +EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); +#endif #endif diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c index e759109abb36..71ecbb3f3262 100644 --- a/arch/x86_64/mm/init.c +++ b/arch/x86_64/mm/init.c @@ -498,6 +498,7 @@ int memory_add_physaddr_to_nid(u64 start) { return 0; } +EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); #endif #else /* CONFIG_MEMORY_HOTPLUG */ diff --git a/arch/x86_64/mm/srat.c b/arch/x86_64/mm/srat.c index 8491300ef909..3cc0544e25f5 100644 --- a/arch/x86_64/mm/srat.c +++ b/arch/x86_64/mm/srat.c @@ -477,3 +477,5 @@ int memory_add_physaddr_to_nid(u64 start) return ret; } +EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); + diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index 1dda370f402b..98099de59b45 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c @@ -238,6 +238,10 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device) num_enabled++; continue; } + + if (node < 0) + node = memory_add_physaddr_to_nid(info->start_addr); + result = add_memory(node, info->start_addr, info->length); if (result) continue; |