diff options
-rw-r--r-- | arch/ia64/kernel/topology.c | 2 | ||||
-rw-r--r-- | include/asm-ia64/numa.h | 2 |
2 files changed, 2 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 | } |
diff --git a/include/asm-ia64/numa.h b/include/asm-ia64/numa.h index e0a1d173e42d..7d5e2ccc37a0 100644 --- 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); | |||
69 | 69 | ||
70 | 70 | ||
71 | #else /* !CONFIG_NUMA */ | 71 | #else /* !CONFIG_NUMA */ |
72 | #define map_cpu_to_node(cpu, nid) do{}while(0) | ||
73 | #define unmap_cpu_from_node(cpu, nid) do{}while(0) | ||
72 | 74 | ||
73 | #define paddr_to_nid(addr) 0 | 75 | #define paddr_to_nid(addr) 0 |
74 | 76 | ||