diff options
author | KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> | 2006-09-27 04:49:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 11:26:08 -0400 |
commit | bbf2bef9f50eb119ffadd735eb0966ac8a04f91f (patch) | |
tree | 8eee0357d62723aedb04787c0e398695a7704d16 /arch/ia64/kernel/topology.c | |
parent | a5b08073a0b512d75fa1a7f82ee850e5c105cce9 (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>
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) | |||
36 | */ | 36 | */ |
37 | if (!can_cpei_retarget() && is_cpu_cpei_target(num)) | 37 | if (!can_cpei_retarget() && is_cpu_cpei_target(num)) |
38 | sysfs_cpus[num].cpu.no_control = 1; | 38 | sysfs_cpus[num].cpu.no_control = 1; |
39 | #ifdef CONFIG_NUMA | ||
40 | map_cpu_to_node(num, node_cpuid[num].nid); | 39 | map_cpu_to_node(num, node_cpuid[num].nid); |
41 | #endif | 40 | #endif |
42 | #endif | ||
43 | 41 | ||
44 | return register_cpu(&sysfs_cpus[num].cpu, num); | 42 | return register_cpu(&sysfs_cpus[num].cpu, num); |
45 | } | 43 | } |