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

[Toralf Förster]

At Friday 09 May 2008 11:58:37 Ingo Molnar wrote :
> 
> * WANG Cong <xiyou.wangcong@xxxxxxxxx> wrote:
> 
> > Sorry. Ignore previous one. This one should be correct, I think.
> > 
> > ---
> > 
> > diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c
> > index 8acbf0c..2e8388b 100644
> > --- a/arch/x86/mach-voyager/voyager_smp.c
> > +++ b/arch/x86/mach-voyager/voyager_smp.c
> > @@ -74,7 +74,7 @@ EXPORT_SYMBOL(cpu_online_map);
> >  
> >  /* Bitmask of CPUs present in the system - exported by i386_syms.c, used
> >   * by scheduler but indexed physically */
> > -cpumask_t phys_cpu_present_map = CPU_MASK_NONE;
> > +static cpumask_t phys_cpu_present_map = CPU_MASK_NONE;
> 
> i've got the one below queued up but it's stalled as it could easily be 
> wrong and there's no ack from James yet and there's been discussion back 
> and forth. James, what do you suggest?
> 
tested config with this patch, again it solves the issue and I got now (as expected) :
...
  OBJCOPY arch/x86/boot/setup.bin
  OBJCOPY arch/x86/boot/vmlinux.bin
  HOSTCC  arch/x86/boot/tools/build
  BUILD   arch/x86/boot/bzImage
Root device is (3, 8)
Setup is 11288 bytes (padded to 11776 bytes).
System is 1536 kB
CRC 68d1dbe1
Kernel: arch/x86/boot/bzImage is ready  (#15)
  Building modules, stage 2.
  MODPOST 156 modules
ERROR: "i2c_master_send" [drivers/media/video/tuner.ko] undefined!
ERROR: "i2c_detach_client" [drivers/media/video/tuner.ko] undefined!
ERROR: "i2c_del_driver" [drivers/media/video/tuner.ko] undefined!
ERROR: "v4l2_i2c_attach" [drivers/media/video/tuner.ko] undefined!
ERROR: "i2c_register_driver" [drivers/media/video/tuner.ko] undefined!
ERROR: "i2c_master_recv" [drivers/media/video/tuner.ko] undefined!
ERROR: "i2c_probe" [drivers/media/video/tuner.ko] undefined!
ERROR: "i2c_transfer" [drivers/media/common/tuners/xc5000.ko] undefined!
ERROR: "i2c_transfer" [drivers/media/common/tuners/tuner-xc2028.ko] undefined!
ERROR: "i2c_transfer" [drivers/media/common/tuners/tuner-simple.ko] undefined!
ERROR: "i2c_clients_command" [drivers/media/common/tuners/tuner-simple.ko] undefined!
ERROR: "i2c_transfer" [drivers/media/common/tuners/tea5767.ko] undefined!
ERROR: "i2c_transfer" [drivers/media/common/tuners/tea5761.ko] undefined!
ERROR: "i2c_transfer" [drivers/media/common/tuners/tda9887.ko] undefined!
ERROR: "i2c_transfer" [drivers/media/common/tuners/tda8290.ko] undefined!
ERROR: "i2c_transfer" [drivers/media/common/tuners/mt20xx.ko] undefined!
make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2


> 	Ingo
> 
> -------------------->
> Subject: x86, voyager: build fix
> From: Ingo Molnar <mingo@xxxxxxx>
> Date: Sun May 04 23:56:30 CEST 2008
> 
> Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
> ---
>  arch/x86/mach-voyager/voyager_smp.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: linux-x86.q/arch/x86/mach-voyager/voyager_smp.c
> ===================================================================
> --- linux-x86.q.orig/arch/x86/mach-voyager/voyager_smp.c
> +++ linux-x86.q/arch/x86/mach-voyager/voyager_smp.c
> @@ -74,7 +74,7 @@ EXPORT_SYMBOL(cpu_online_map);
>  
>  /* Bitmask of CPUs present in the system - exported by i386_syms.c, used
>   * by scheduler but indexed physically */
> -cpumask_t phys_cpu_present_map = CPU_MASK_NONE;
> +extern cpumask_t phys_cpu_present_map;
>  
>  /* The internal functions */
>  static void send_CPI(__u32 cpuset, __u8 cpi);
> 



-- 
MfG/Sincerely

Toralf Förster
pgp finger print: 7B1A 07F4 EC82 0F90 D4C2 8936 872A E508 7DB6 9DA3

Attachment: signature.asc
Description: This is a digitally signed message part.