From 5eb9eb64dcca3054b58af13e86b1fd47e33f4b00 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sat, 25 Mar 2006 13:00:17 -0800 Subject: [PATCH] --- yaml --- r: 23998 b: refs/heads/master c: 7d3aee9a9686ffc235c343dcab85c3ebea78908a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/smp.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f87bec102a65..efb3feda3343 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3cbb90a9cb7854b1110663919d5bc3da3f46d5e3 +refs/heads/master: 7d3aee9a9686ffc235c343dcab85c3ebea78908a diff --git a/trunk/arch/sparc64/kernel/smp.c b/trunk/arch/sparc64/kernel/smp.c index 1b6e2ade1008..7dc28a484268 100644 --- a/trunk/arch/sparc64/kernel/smp.c +++ b/trunk/arch/sparc64/kernel/smp.c @@ -1298,6 +1298,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) while (!cpu_find_by_instance(instance, NULL, &mid)) { if (mid != boot_cpu_id) { cpu_clear(mid, phys_cpu_present_map); + cpu_clear(mid, cpu_present_map); if (num_possible_cpus() <= max_cpus) break; } @@ -1332,8 +1333,10 @@ void __init smp_setup_cpu_possible_map(void) instance = 0; while (!cpu_find_by_instance(instance, NULL, &mid)) { - if (mid < NR_CPUS) + if (mid < NR_CPUS) { cpu_set(mid, phys_cpu_present_map); + cpu_set(mid, cpu_present_map); + } instance++; } }