[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>

diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index 05bdf7a..5629b45 100644 (file)
--- 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 e0a1d17..7d5e2cc 100644 (file)
--- 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