summaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/topology.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-28 00:13:53 +0200
committerJeff Garzik <jeff@garzik.org>2006-09-28 00:13:53 +0200
commitaebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch)
tree57425aa83c8bed5b41af7e3408024fe1f2fdded9 /arch/ia64/kernel/topology.c
parentMerge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 ... (diff)
parentMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff)
downloadlinux-aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b.tar.xz
linux-aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b.zip
Merge branch 'master' into upstream
Diffstat (limited to 'arch/ia64/kernel/topology.c')
-rw-r--r--arch/ia64/kernel/topology.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index 05bdf7affb43..5629b45e89c6 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);
}