2.6.9-mm1: pc_debug multiple definitions

2.6.9-mm1: pc_debug multiple definitions

[Adrian Bunk]

The following compile error comes from Linus' tree:


<--  snip  -->

...
  LD      drivers/built-in.o
drivers/pcmcia/built-in.o(.bss+0xf20): multiple definition of `pc_debug'
drivers/net/built-in.o(.data+0x24ae0): first defined here
make[1]: *** [drivers/built-in.o] Error 1

<--  snip  -->


The pc_debug in drivers/pcmcia/ds.c was made non-static in Linus' tree,
but the global definition of a global variable with such a generic name 
in drivers/net/wireless/prism54/islpci_mgt.c seems to be equally wrong.


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

Re: 2.6.9-mm1: pc_debug multiple definitions

[Russell King]

On Fri, Oct 22, 2004 at 03:39:29PM +0200, Adrian Bunk wrote:
> 
> The following compile error comes from Linus' tree:
> 
> 
> <--  snip  -->
> 
> ...
>   LD      drivers/built-in.o
> drivers/pcmcia/built-in.o(.bss+0xf20): multiple definition of `pc_debug'
> drivers/net/built-in.o(.data+0x24ae0): first defined here
> make[1]: *** [drivers/built-in.o] Error 1
> 
> <--  snip  -->
> 
> 
> The pc_debug in drivers/pcmcia/ds.c was made non-static in Linus' tree,
> but the global definition of a global variable with such a generic name 
> in drivers/net/wireless/prism54/islpci_mgt.c seems to be equally wrong.

I've forwarded it to Dominik to sort out with suggested solutions.
Hopefully Dominik will forward a fix soon.

(PS, I dropped David Hinds from the CC list - David doesn't maintain
2.6 PCMCIA.)

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 PCMCIA      - http://pcmcia.arm.linux.org.uk/
                 2.6 Serial core

Re: 2.6.9-mm1: pc_debug multiple definitions

[Luis R. Rodriguez]

On Fri, Oct 22, 2004 at 03:39:29PM +0200, Adrian Bunk wrote:
> 
> The following compile error comes from Linus' tree:
> 
> 
> <--  snip  -->
> 
> ...
>   LD      drivers/built-in.o
> drivers/pcmcia/built-in.o(.bss+0xf20): multiple definition of `pc_debug'
> drivers/net/built-in.o(.data+0x24ae0): first defined here
> make[1]: *** [drivers/built-in.o] Error 1
> 
> <--  snip  -->
> 
> 
> The pc_debug in drivers/pcmcia/ds.c was made non-static in Linus' tree,
> but the global definition of a global variable with such a generic name 
> in drivers/net/wireless/prism54/islpci_mgt.c seems to be equally wrong.

Great, anyone know why this change was done on ds.c ? The pc_debug on
prism54 comes from the original Intersil driver. It is used to for
debugging but we should move away from our current debugging mechanism
to netif_msg.

Margit, do you have some pending commits left? Do you want to take a
stab at this? If not I can later on this week.

	Luis

-- 
GnuPG Key fingerprint = 113F B290 C6D2 0251 4D84  A34A 6ADD 4937 E20A 525E

Re: 2.6.9-mm1: pc_debug multiple definitions

[Adrian Bunk]

On Sat, Oct 23, 2004 at 11:41:52PM -0400, Luis R. Rodriguez wrote:
> On Fri, Oct 22, 2004 at 03:39:29PM +0200, Adrian Bunk wrote:
> > 
> > The following compile error comes from Linus' tree:
> > 
> > 
> > <--  snip  -->
> > 
> > ...
> >   LD      drivers/built-in.o
> > drivers/pcmcia/built-in.o(.bss+0xf20): multiple definition of `pc_debug'
> > drivers/net/built-in.o(.data+0x24ae0): first defined here
> > make[1]: *** [drivers/built-in.o] Error 1
> > 
> > <--  snip  -->
> > 
> > 
> > The pc_debug in drivers/pcmcia/ds.c was made non-static in Linus' tree,
> > but the global definition of a global variable with such a generic name 
> > in drivers/net/wireless/prism54/islpci_mgt.c seems to be equally wrong.
> 
> Great, anyone know why this change was done on ds.c ? The pc_debug on
> prism54 comes from the original Intersil driver. It is used to for
> debugging but we should move away from our current debugging mechanism
> to netif_msg.
>...

pc_debug is a pretty generic name - it seems too generic in both files.

In prism54, couldn't it be called prism54_pc_debug?

> 	Luis

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

Re: 2.6.9-mm1: pc_debug multiple definitions

[Luis R. Rodriguez]

On Sun, Oct 24, 2004 at 11:33:40AM +0200, Adrian Bunk wrote:
> On Sat, Oct 23, 2004 at 11:41:52PM -0400, Luis R. Rodriguez wrote:
> > On Fri, Oct 22, 2004 at 03:39:29PM +0200, Adrian Bunk wrote:
> > > 
> > > The following compile error comes from Linus' tree:
> > > 
> > > 
> > > <--  snip  -->
> > > 
> > > ...
> > >   LD      drivers/built-in.o
> > > drivers/pcmcia/built-in.o(.bss+0xf20): multiple definition of `pc_debug'
> > > drivers/net/built-in.o(.data+0x24ae0): first defined here
> > > make[1]: *** [drivers/built-in.o] Error 1
> > > 
> > > <--  snip  -->
> > > 
> > > 
> > > The pc_debug in drivers/pcmcia/ds.c was made non-static in Linus' tree,
> > > but the global definition of a global variable with such a generic name 
> > > in drivers/net/wireless/prism54/islpci_mgt.c seems to be equally wrong.
> > 
> > Great, anyone know why this change was done on ds.c ? The pc_debug on
> > prism54 comes from the original Intersil driver. It is used to for
> > debugging but we should move away from our current debugging mechanism
> > to netif_msg.
> >...
> 
> pc_debug is a pretty generic name - it seems too generic in both files.
> 
> In prism54, couldn't it be called prism54_pc_debug?

Sure although that's doing a half ass job. It'll fix your compile
problems for sure but ideally we should move away from the old debug
mechanisms that came with the driver originally. We do this by moving to
to netif_msg.

	Luis

-- 
GnuPG Key fingerprint = 113F B290 C6D2 0251 4D84  A34A 6ADD 4937 E20A 525E