diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-28 00:13:53 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-28 00:13:53 +0200 |
commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /arch/ia64/kernel/topology.c | |
parent | Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 ... (diff) | |
parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
download | linux-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.c | 2 |
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); } |