Re: build issue #380 for v2.6.26-rc1-279-g28a4acb : mach-voyager: multiple definition of `phys_cpu_present_map'

[WANG Cong <xiyou.wangcong@gmail.com>]

On Sat, May 10, 2008 at 09:01:48AM -0500, James Bottomley wrote:
>
>OK, so these symbols are required on visws as well.  So that makes the
>gating config symbol X86_LOCAL_APIC.
>
>Could you run this through the same config to verify; thanks!
>
>James
>
>---
>
>From: James Bottomley <James.Bottomley@HansenPartnership.com>
>Subject: [VOYAGER] fix duplicate phys_cpu_present_map symbol
>
>The phys_cpu_present_map is an expected symbol in the SMP harness.
>Unfortunately, x86 recently moved this and a few others to
>kernel/setup.c where it doesn't quite work because voyager has to
>define its own.  Use CONFIG_X86_LOCAL_APIC to isolate these
>definitions and fix up another area in setup.c where CONFIG_X86_SMP
>should be used instead of CONFIG_SMP.
>

Hmmm, I rechecked the files used 'phys_cpu_present_map'.

$ grep -nr "mpspec.h" arch/x86/ | cut -d: -f 1 | xargs grep "phys_cpu_present_map" | cut -d: -f 1 | uniq
arch/x86/kernel/setup.c
arch/x86/kernel/apic_64.c
arch/x86/kernel/apic_32.c

And in Makefile:

obj-$(CONFIG_X86_LOCAL_APIC)    += apic_$(BITS).o nmi_$(BITS).o

So your patch looks correct!

Thanks.

 Cong