Re: [PATCH] voyager: fix cpu bootmaps

From: Rusty Russell
Date: Sat Jan 31 2009 - 07:58:19 EST


On Saturday 31 January 2009 05:01:57 James Bottomley wrote:
> commit 98a79d6a50181ca1ecf7400eda01d5dc1bc0dbf0
> Author: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
> Date: Sat Dec 13 21:19:41 2008 +1030
>
> cpumask: centralize cpu_online_map and cpu_possible_map
>
> Broke voyager largely because it currently initialises the
> possible_map by copying, which isn't possible in the new scheme. Fix
> this by using init_cpu_possible() instead and tidy up other of the
> cpumask declarations which now have global variables.
>
> Signed-off-by: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx>
> ---
> arch/x86/mach-voyager/voyager_smp.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c
> index 9840b7e..dcc07d5 100644
> --- a/arch/x86/mach-voyager/voyager_smp.c
> +++ b/arch/x86/mach-voyager/voyager_smp.c
> @@ -378,7 +378,7 @@ void __init find_smp_config(void)
> cpus_addr(phys_cpu_present_map)[0] |=
> voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK +
> 3) << 24;
> - cpu_possible_map = phys_cpu_present_map;
> + init_cpu_possible(&phys_cpu_present_map);
> printk("VOYAGER SMP: phys_cpu_present_map = 0x%lx\n",
> cpus_addr(phys_cpu_present_map)[0]);
> /* Here we set up the VIC to enable SMP */

Strange, the assignment should still work, even though this new method is
preferred.

How do your patches normally get upstream? I'd normally just fwd this to
Ingo...

Sorry I broke your platform...
Rusty.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/