Re: Voyager phys_cpu_present_map compile error

Adrian Bunk
2008-04-25T16:18:44Z

On Fri, Apr 25, 2008 at 09:50:43AM -0500, James Bottomley wrote:
> On Mon, 2008-04-21 at 22:14 +0200, Ingo Molnar wrote:
> > * Adrian Bunk <bunk@kernel.org> wrote:
> >
> > > > +#ifndef CONFIG_X86_VOYAGER
> > > > /* Bitmask of physically existing CPUs */
> > > > physid_mask_t phys_cpu_present_map;
> > > > +#endif
> > > >...
> > >
> > > Alexey noted that phys_cpu_present_map for Voyager and !Voyager also
> > > have different types and suggested to make the Voyager one static
> > > instead (additional renaming of the Voyager one also makes sense).
> >
> > yep, done by the patch below.
>
> Actually, this isn't the right patch. The point is not to avoid the
> symbol clash, it's to let voyager identify correctly that you have a
> leaking symbol. In this case phys_cpu_present_map is exposed outside of
> SMP. The correct fix (and one which sweeps op other storage for
> unnecessary symbols is this):
>
> James
>
> ---
>
> diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
> index c0c68c1..d68aa53 100644
> --- a/arch/x86/kernel/setup.c
> +++ b/arch/x86/kernel/setup.c
> @@ -12,6 +12,7 @@
> #include <asm/mpspec.h>
> #include <asm/apicdef.h>
>
> +#ifdef CONIFG_X86_SMP
>...

tpyo ;)

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed