diff --git a/[refs] b/[refs]
index c5f880ae2798..7330cd678fef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5b08073a0b512d75fa1a7f82ee850e5c105cce9
+refs/heads/master: bbf2bef9f50eb119ffadd735eb0966ac8a04f91f
diff --git a/trunk/arch/ia64/kernel/topology.c b/trunk/arch/ia64/kernel/topology.c
index 05bdf7affb43..5629b45e89c6 100644
--- a/trunk/arch/ia64/kernel/topology.c
+++ b/trunk/arch/ia64/kernel/topology.c
@@ -36,9 +36,7 @@ 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/trunk/include/asm-ia64/numa.h b/trunk/include/asm-ia64/numa.h
index e0a1d173e42d..7d5e2ccc37a0 100644
--- a/trunk/include/asm-ia64/numa.h
+++ b/trunk/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