The patch titled
x86_64 memory hot-add: create arch_find_node
has been removed from the -mm tree. Its filename is
x86_64-memory-hot-add-create-arch_find_node.patch
This patch was dropped because rework is expected
------------------------------------------------------
Subject: x86_64 memory hot-add: create arch_find_node
From: keith mannthey <kmannth@xxxxxxxxxx>
With the advent of the new ACPI hot-plug memory driver and mechanism is needed
to deal with ACPI add memory events that do not contain the pxm (node)
information. I do not believe that the add-event is required to contain this
information so I create a arch_find_node generic layer used in the generic
add_memory function.
If add_memory is called with node < 0 arch_find_node is invoked to fine the
correct node to add the memory. This created the generic construct of
arch_find_node.
Signed-off-by: Keith Mannthey <kmannth@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/memory_hotplug.h | 6 +++++-
mm/memory_hotplug.c | 9 +++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff -puN include/linux/memory_hotplug.h~x86_64-memory-hot-add-create-arch_find_node include/linux/memory_hotplug.h
--- a/include/linux/memory_hotplug.h~x86_64-memory-hot-add-create-arch_find_node
+++ a/include/linux/memory_hotplug.h
@@ -132,7 +132,11 @@ static inline void arch_refresh_nodedata
}
#endif /* CONFIG_NUMA */
#endif /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */
-
+#ifdef CONFIG_ARCH_FIND_NODE
+ extern int arch_find_node(unsigned long, unsigned long);
+#else
+ static inline int arch_find_node(unsigned long a, unsigned long b) {return 0;}
+#endif
#else /* ! CONFIG_MEMORY_HOTPLUG */
/*
* Stub functions for when hotplug is off
diff -puN mm/memory_hotplug.c~x86_64-memory-hot-add-create-arch_find_node mm/memory_hotplug.c
--- a/mm/memory_hotplug.c~x86_64-memory-hot-add-create-arch_find_node
+++ a/mm/memory_hotplug.c
@@ -233,11 +233,16 @@ static void register_memory_resource(u64
-int add_memory(int nid, u64 start, u64 size)
+int add_memory(int node, u64 start, u64 size)
{
pg_data_t *pgdat = NULL;
int new_pgdat = 0;
- int ret;
+ int ret,nid;
+
+ if (node < 0)
+ nid = arch_find_node(start,size);
+ else
+ nid = node;
if (!node_online(nid)) {
pgdat = hotadd_new_pgdat(nid, start);
_
Patches currently in -mm which might be from kmannth@xxxxxxxxxx are
x86_64-memory-hot-add-create-arch_find_node.patch
x86_64-memory-hot-add-arch_find_node-x86_64.patch
x86_64-memory-hot-add-fix-kernel-mapping-code.patch
x86_64-memory-hot-add-fix-acpi-motherboardc.patch
convert-i386-numa-kva-space-to-bootmem.patch
convert-i386-numa-kva-space-to-bootmem-tidy.patch
convert-i386-summit-subarch-to-use-srat-info-for-apicid_to_node-calls.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
