The patch titled
fix "cpu to node relationship fixup: map cpu to node"
has been added to the -mm tree. Its filename is
fix-cpu-to-node-relationship-fixup-map-cpu-to-node.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: fix "cpu to node relationship fixup: map cpu to node"
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Fix build error introduced by 3212fe1594e577463bc8601d28aa008f520c3377
Non-NUMA case should be handled.
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/ia64/kernel/topology.c | 2 --
include/asm-ia64/numa.h | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff -puN arch/ia64/kernel/topology.c~fix-cpu-to-node-relationship-fixup-map-cpu-to-node arch/ia64/kernel/topology.c
--- a/arch/ia64/kernel/topology.c~fix-cpu-to-node-relationship-fixup-map-cpu-to-node
+++ a/arch/ia64/kernel/topology.c
@@ -36,10 +36,8 @@ int arch_register_cpu(int num)
*/
if (!can_cpei_retarget() && is_cpu_cpei_target(num))
sysfs_cpus[num].cpu.no_control = 1;
-#ifdef CONFIG_NUMA
map_cpu_to_node(num, node_cpuid[num].nid);
#endif
-#endif
return register_cpu(&sysfs_cpus[num].cpu, num);
}
diff -puN include/asm-ia64/numa.h~fix-cpu-to-node-relationship-fixup-map-cpu-to-node include/asm-ia64/numa.h
--- a/include/asm-ia64/numa.h~fix-cpu-to-node-relationship-fixup-map-cpu-to-node
+++ a/include/asm-ia64/numa.h
@@ -69,6 +69,8 @@ extern void unmap_cpu_from_node(int cpu,
#else /* !CONFIG_NUMA */
+#define map_cpu_to_node(cpu, nid) do{}while(0)
+#define unmap_cpu_from_node(cpu, nid) do{}while(0)
#define paddr_to_nid(addr) 0
_
Patches currently in -mm which might be from kamezawa.hiroyu@xxxxxxxxxxxxxx are
origin.patch
fix-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-use-config_memory_hotplug_sparse.patch
hot-add-mem-x86_64-use-config_memory_hotplug_reserve.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
