summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-07-11 19:42:58 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-07-11 19:42:58 +0100
commit73eb7d9e8cfd16813eec94d0ec8fa2a5262a85cc (patch)
tree79c81babb78c36f94f677ee587ab884903fffa12 /arch
parente11b2236eace94ad9a2e421904742e83976405ed (diff)
downloadlinux-73eb7d9e8cfd16813eec94d0ec8fa2a5262a85cc.tar.gz
linux-73eb7d9e8cfd16813eec94d0ec8fa2a5262a85cc.tar.bz2
linux-73eb7d9e8cfd16813eec94d0ec8fa2a5262a85cc.zip
[PATCH] ARM SMP: Initialise cpu_present_map
Rather than relying on the fixup code in init/main.c, explicitly initialise cpu_present_map. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/kernel/smp.c1
-rw-r--r--arch/arm/mach-integrator/platsmp.c6
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 78c24a1266b1..7ae45c3fc834 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -236,6 +236,7 @@ void __init smp_prepare_boot_cpu(void)
unsigned int cpu = smp_processor_id();
cpu_set(cpu, cpu_possible_map);
+ cpu_set(cpu, cpu_present_map);
cpu_set(cpu, cpu_online_map);
}
diff --git a/arch/arm/mach-integrator/platsmp.c b/arch/arm/mach-integrator/platsmp.c
index 88f40a5189cd..2ba025777098 100644
--- a/arch/arm/mach-integrator/platsmp.c
+++ b/arch/arm/mach-integrator/platsmp.c
@@ -174,11 +174,13 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
max_cpus = ncores;
/*
- * Initialise the present mask - this tells us which CPUs should
- * be present.
+ * Initialise the possible/present maps.
+ * cpu_possible_map describes the set of CPUs which may be present
+ * cpu_present_map describes the set of CPUs populated
*/
for (i = 0; i < max_cpus; i++) {
cpu_set(i, cpu_possible_map);
+ cpu_set(i, cpu_present_map);
}
/*