The patch titled
hot-add-mem-x86_64-memory_add_physaddr_to_nid-node-fixup fix
has been removed from the -mm tree. Its filename is
hot-add-mem-x86_64-memory_add_physaddr_to_nid-node-fixup-fix.patch
This patch was dropped because it was folded into hot-add-mem-x86_64-memory_add_physaddr_to_nid-node-fixup.patch
------------------------------------------------------
Subject: hot-add-mem-x86_64-memory_add_physaddr_to_nid-node-fixup fix
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
This patch is necessary for ia64
drivers/built-in.o(.text+0x6c661): In function `acpi_memory_enable_device':
: undefined reference to `memory_add_physaddr_to_nid'
ia64 has to define memory_add_physaddr_to_nid()
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Keith Mannthey <kmannth@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/ia64/mm/numa.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff -puN arch/ia64/mm/numa.c~hot-add-mem-x86_64-memory_add_physaddr_to_nid-node-fixup-fix arch/ia64/mm/numa.c
--- a/arch/ia64/mm/numa.c~hot-add-mem-x86_64-memory_add_physaddr_to_nid-node-fixup-fix
+++ a/arch/ia64/mm/numa.c
@@ -69,4 +69,20 @@ 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;
+}
+
+#endif
#endif
_
Patches currently in -mm which might be from kamezawa.hiroyu@xxxxxxxxxxxxxx are
cpu-to-node-relationship-fixup-take2.patch
cpu-to-node-relationship-fixup-map-cpu-to-node.patch
hot-add-mem-x86_64-fixup-externs.patch
hot-add-mem-x86_64-kconfig-changes.patch
hot-add-mem-x86_64-enable-sparsemem-in-sratc.patch
hot-add-mem-x86_64-memory_add_physaddr_to_nid-enable.patch
hot-add-mem-x86_64-memory_add_physaddr_to_nid-node-fixup.patch
hot-add-mem-x86_64-memory_add_physaddr_to_nid-node-fixup-fix.patch
hot-add-mem-x86_64-use-config_memory_hotplug_sparse.patch
hot-add-mem-x86_64-use-config_memory_hotplug_reserve.patch
hot-add-mem-x86_64-use-config_memory_hotplug_reserve-fix.patch
introduce-mechanism-for-registering-active-regions-of-memory.patch
have-power-use-add_active_range-and-free_area_init_nodes.patch
have-x86-use-add_active_range-and-free_area_init_nodes.patch
have-x86-use-add_active_range-and-free_area_init_nodes-fix.patch
have-x86_64-use-add_active_range-and-free_area_init_nodes.patch
have-ia64-use-add_active_range-and-free_area_init_nodes.patch
account-for-memmap-and-optionally-the-kernel-image-as-holes.patch
account-for-holes-that-are-outside-the-range-of-physical-memory.patch
allow-an-arch-to-expand-node-boundaries.patch
proc-readdir-race-fix-take-3.patch
proc-readdir-race-fix-take-3-fix-1.patch
proc-readdir-race-fix-take-3-fix-2.patch
namespaces-utsname-sysctl-hack.patch
reiser4-hardirq-include-fix.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
