aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>2006-09-27 01:49:25 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-27 08:26:08 -0700
commitbbf2bef9f50eb119ffadd735eb0966ac8a04f91f (patch)
tree8eee0357d62723aedb04787c0e398695a7704d16
parenta5b08073a0b512d75fa1a7f82ee850e5c105cce9 (diff)
[PATCH] fix "cpu to node relationship fixup: map cpu to node"
Fix build error introduced by 3212fe1594e577463bc8601d28aa008f520c3377 Non-NUMA case should be handled. Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/ia64/kernel/topology.c2
-rw-r--r--include/asm-ia64/numa.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index 05bdf7affb4..5629b45e89c 100644
--- a/arch/ia64/kernel/topology.c
+++ b/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 --git a/include/asm-ia64/numa.h b/include/asm-ia64/numa.h
index e0a1d173e42..7d5e2ccc37a 100644
--- a/include/asm-ia64/numa.h
+++ b/include/asm-ia64/numa.h
@@ -69,6 +69,8 @@ extern void unmap_cpu_from_node(int cpu, int nid);
#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