diff options
author | Keith Mannthey <kmannth@us.ibm.com> | 2006-10-01 02:27:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 03:39:18 -0400 |
commit | 8c2676a5870ab15cbeea9f826266bc946fe3cc26 (patch) | |
tree | 0df06fce24312d7f2d1120d984dd7ae258cb40ef /arch/x86_64 | |
parent | 4942e998b40b8f6080930ec16442444e9930aee5 (diff) |
[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>
Diffstat (limited to 'arch/x86_64')
-rw-r--r-- | arch/x86_64/mm/init.c | 1 | ||||
-rw-r--r-- | arch/x86_64/mm/srat.c | 2 |
2 files changed, 3 insertions, 0 deletions
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) | |||
498 | { | 498 | { |
499 | return 0; | 499 | return 0; |
500 | } | 500 | } |
501 | EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); | ||
501 | #endif | 502 | #endif |
502 | 503 | ||
503 | #else /* CONFIG_MEMORY_HOTPLUG */ | 504 | #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) | |||
477 | 477 | ||
478 | return ret; | 478 | return ret; |
479 | } | 479 | } |
480 | EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); | ||
481 | |||