From a3db1aae137dfbd5d5cb5d4a39c49122a1c69176 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 11 Jul 2005 19:42:58 +0100 Subject: [PATCH] --- yaml --- r: 4759 b: refs/heads/master c: 73eb7d9e8cfd16813eec94d0ec8fa2a5262a85cc h: refs/heads/master i: 4757: 8983326f88912bbdb11f7e289b4824622edc5612 4755: 9fc91870395bce3222ae1e92a97eba489f725f30 4751: d2af4f6dc8cb72e183ddf08cb8f13a32e54b74dd v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/smp.c | 1 + trunk/arch/arm/mach-integrator/platsmp.c | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d2f675c9176b..6742e2478e67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e11b2236eace94ad9a2e421904742e83976405ed +refs/heads/master: 73eb7d9e8cfd16813eec94d0ec8fa2a5262a85cc diff --git a/trunk/arch/arm/kernel/smp.c b/trunk/arch/arm/kernel/smp.c index 78c24a1266b1..7ae45c3fc834 100644 --- a/trunk/arch/arm/kernel/smp.c +++ b/trunk/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/trunk/arch/arm/mach-integrator/platsmp.c b/trunk/arch/arm/mach-integrator/platsmp.c index 88f40a5189cd..2ba025777098 100644 --- a/trunk/arch/arm/mach-integrator/platsmp.c +++ b/trunk/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); } /*