Re: 2.6.19-rc5-mm1 -- ppc64 ohci-hdc.c compile failure

Re: 2.6.19-rc5-mm1 -- ppc64 ohci-hdc.c compile failure

[Andy Whitcroft]

We are seeing compile failures on ppc64 in ohci-hcd.c as below:

In file included from drivers/usb/host/ohci-hcd.c:949:
drivers/usb/host/ohci-ppc-of.c: In function `ohci_hcd_ppc_of_init':
drivers/usb/host/ohci-ppc-of.c:272: warning: int format, different type
arg (arg 2)
drivers/usb/host/ohci-ppc-of.c:272: warning: int format, different type
arg (arg 3)
drivers/usb/host/ohci-ppc-of.c: At top level:
drivers/usb/host/ohci-ppc-of.c:282: error: redefinition of `__inittest'
drivers/usb/host/ohci-pci.c:252: error: `__inittest' previously defined here
drivers/usb/host/ohci-ppc-of.c:282: error: redefinition of `init_module'
drivers/usb/host/ohci-pci.c:252: error: `init_module' previously defined
here
drivers/usb/host/ohci-ppc-of.c:283: error: redefinition of `__exittest'
drivers/usb/host/ohci-pci.c:260: error: `__exittest' previously defined here
drivers/usb/host/ohci-ppc-of.c:283: error: redefinition of `cleanup_module'
drivers/usb/host/ohci-pci.c:260: error: `cleanup_module' previously
defined here

Seems that the patch below has introduced USB_OHCI_HCD_PPC_OF enabled by
default.  When it and CONFIG_USB_OHCI_HCD_PPC_SOC are enabled which
occured by default on my config then we end up with two module_init()
calls, which is illegal.

  powerpc-add-of_platform-support-for-ohci-bigendian-hc

I am guessing that we are only meant to be able to have one of these
defined at a time?  I changed the default to n for this and I could at
least compile the kernel, but I am sure thats not the right fix.

Nicolas?

-apw

Re: 2.6.19-rc5-mm1 -- ppc64 ohci-hdc.c compile failure

[Benjamin Herrenschmidt]

> Seems that the patch below has introduced USB_OHCI_HCD_PPC_OF enabled by
> default.  When it and CONFIG_USB_OHCI_HCD_PPC_SOC are enabled which
> occured by default on my config then we end up with two module_init()
> calls, which is illegal.
> 
>   powerpc-add-of_platform-support-for-ohci-bigendian-hc
> 
> I am guessing that we are only meant to be able to have one of these
> defined at a time?  I changed the default to n for this and I could at
> least compile the kernel, but I am sure thats not the right fix.

Paul, which patch did you merge ? I rejected the initial one that was
doing 2 drivers/probe routines and Nicolas did a new one.. You may have
taken the wrong one.

Cheers.
Ben.

Re: 2.6.19-rc5-mm1 -- ppc64 ohci-hdc.c compile failure

[Paul Mackerras]

Benjamin Herrenschmidt writes:

> > Seems that the patch below has introduced USB_OHCI_HCD_PPC_OF enabled by
> > default.  When it and CONFIG_USB_OHCI_HCD_PPC_SOC are enabled which
> > occured by default on my config then we end up with two module_init()
> > calls, which is illegal.
> > 
> >   powerpc-add-of_platform-support-for-ohci-bigendian-hc
> > 
> > I am guessing that we are only meant to be able to have one of these
> > defined at a time?  I changed the default to n for this and I could at
> > least compile the kernel, but I am sure thats not the right fix.
> 
> Paul, which patch did you merge ? I rejected the initial one that was
> doing 2 drivers/probe routines and Nicolas did a new one.. You may have
> taken the wrong one.

I didn't merge either of them.

Paul.

Re: 2.6.19-rc5-mm1 -- ppc64 ohci-hdc.c compile failure

[Benjamin Herrenschmidt]

On Fri, 2006-11-10 at 20:49 +1100, Paul Mackerras wrote:
> Benjamin Herrenschmidt writes:
> 
> > > Seems that the patch below has introduced USB_OHCI_HCD_PPC_OF enabled by
> > > default.  When it and CONFIG_USB_OHCI_HCD_PPC_SOC are enabled which
> > > occured by default on my config then we end up with two module_init()
> > > calls, which is illegal.
> > > 
> > >   powerpc-add-of_platform-support-for-ohci-bigendian-hc
> > > 
> > > I am guessing that we are only meant to be able to have one of these
> > > defined at a time?  I changed the default to n for this and I could at
> > > least compile the kernel, but I am sure thats not the right fix.
> > 
> > Paul, which patch did you merge ? I rejected the initial one that was
> > doing 2 drivers/probe routines and Nicolas did a new one.. You may have
> > taken the wrong one.
> 
> I didn't merge either of them.

Ah, must be Andrew then. Andrew, can you drop this (along with the other
Efika/MPC5200) patches from -mm ? They'll get in via the powerpc merge
and I'll make sure Paulus gets the right versions.

Cheers,
Ben.