diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-11 12:38:36 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-11 12:38:36 -0400 |
commit | d12734d14e5602816f0b16b17a8cef5ea70afb5a (patch) | |
tree | cb6793f2bd1d5bbc53562c690e3e09351439e98a /arch/arm | |
parent | 7343c9ba8ed9d504cd2daf960da58971c6631601 (diff) |
[PATCH] ARM SMP: Rename cpu_present_mask to cpu_possible_map
The kernel's terminology for this is cpu_possible_map not
cpu_present_mask.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/kernel/smp.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-integrator/platsmp.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index a931409c8fe4..44a27b2a3c29 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c | |||
@@ -36,7 +36,7 @@ | |||
36 | * The present bitmask indicates that the CPU is physically present. | 36 | * The present bitmask indicates that the CPU is physically present. |
37 | * The online bitmask indicates that the CPU is up and running. | 37 | * The online bitmask indicates that the CPU is up and running. |
38 | */ | 38 | */ |
39 | cpumask_t cpu_present_mask; | 39 | cpumask_t cpu_possible_map; |
40 | cpumask_t cpu_online_map; | 40 | cpumask_t cpu_online_map; |
41 | 41 | ||
42 | /* | 42 | /* |
@@ -235,7 +235,7 @@ void __init smp_prepare_boot_cpu(void) | |||
235 | { | 235 | { |
236 | unsigned int cpu = smp_processor_id(); | 236 | unsigned int cpu = smp_processor_id(); |
237 | 237 | ||
238 | cpu_set(cpu, cpu_present_mask); | 238 | cpu_set(cpu, cpu_possible_map); |
239 | cpu_set(cpu, cpu_online_map); | 239 | cpu_set(cpu, cpu_online_map); |
240 | } | 240 | } |
241 | 241 | ||
diff --git a/arch/arm/mach-integrator/platsmp.c b/arch/arm/mach-integrator/platsmp.c index ead15dfcb53d..88f40a5189cd 100644 --- a/arch/arm/mach-integrator/platsmp.c +++ b/arch/arm/mach-integrator/platsmp.c | |||
@@ -178,7 +178,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) | |||
178 | * be present. | 178 | * be present. |
179 | */ | 179 | */ |
180 | for (i = 0; i < max_cpus; i++) { | 180 | for (i = 0; i < max_cpus; i++) { |
181 | cpu_set(i, cpu_present_mask); | 181 | cpu_set(i, cpu_possible_map); |
182 | } | 182 | } |
183 | 183 | ||
184 | /* | 184 | /* |