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.
This was built against 2.6.18-rc2.
Signed-off-by: Keith Mannthey <[email protected]>
diff -urN orig/include/linux/memory_hotplug.h work/include/linux/memory_hotplug.h
--- orig/include/linux/memory_hotplug.h 2006-07-28 13:57:37.000000000 -0400
+++ work/include/linux/memory_hotplug.h 2006-07-26 20:18:35.000000000 -0400
@@ -132,7 +132,11 @@
}
#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 -urN orig/mm/memory_hotplug.c work/mm/memory_hotplug.c
--- orig/mm/memory_hotplug.c 2006-07-28 13:57:38.000000000 -0400
+++ work/mm/memory_hotplug.c 2006-07-26 20:18:35.000000000 -0400
@@ -233,12 +233,17 @@
-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);
if (!pgdat)
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]