[PATCH] toshiba_ohci1394_dmi_table should be __devinitdata, not __devinit

[PATCH] toshiba_ohci1394_dmi_table should be __devinitdata, not __devinit

[Roland Dreier]

I don't really understand why gcc gives the error it does, but without
this patch, when building with CONFIG_HOTPLUG=n, I get errors like:

      CC      arch/x86_64/pci/../../i386/pci/fixup.o
    arch/x86_64/pci/../../i386/pci/fixup.c: In function `pci_fixup_i450nx':
    arch/x86_64/pci/../../i386/pci/fixup.c:13: error: pci_fixup_i450nx causes a section type conflict

The change is obviously correct: an array should be declared
__devinitdata rather that __devinit.

Signed-off-by: Roland Dreier <rolandd@cisco.com>

diff --git a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c
--- a/arch/i386/pci/fixup.c
+++ b/arch/i386/pci/fixup.c
@@ -398,7 +398,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI
  */
 static u16 toshiba_line_size;
 
-static struct dmi_system_id __devinit toshiba_ohci1394_dmi_table[] = {
+static struct dmi_system_id __devinitdata toshiba_ohci1394_dmi_table[] = {
 	{
 		.ident = "Toshiba PS5 based laptop",
 		.matches = {

Re: [PATCH] toshiba_ohci1394_dmi_table should be __devinitdata, not __devinit

[Jesse Barnes]

[-- Attachment #1: Type: text/plain, Size: 736 bytes --]

On Friday, October 28, 2005 9:50 pm, Roland Dreier wrote:
> I don't really understand why gcc gives the error it does, but
> without this patch, when building with CONFIG_HOTPLUG=n, I get errors
> like:
>
>       CC      arch/x86_64/pci/../../i386/pci/fixup.o
>     arch/x86_64/pci/../../i386/pci/fixup.c: In function
> `pci_fixup_i450nx': arch/x86_64/pci/../../i386/pci/fixup.c:13: error:
> pci_fixup_i450nx causes a section type conflict
>
> The change is obviously correct: an array should be declared
> __devinitdata rather that __devinit.

Oops, yeah I think this is correct.  We should also mark 
toshiba_line_size as __devinitdata.  Patch relative to yours.

Thanks,
Jesse

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

[-- Attachment #2: toshiba-quirk-devinitdata.patch --]
[-- Type: text/x-diff, Size: 477 bytes --]

--- linux-2.6.14/arch/i386/pci/fixup.c.orig	2005-10-29 07:42:46.000000000 -0700
+++ linux-2.6.14/arch/i386/pci/fixup.c	2005-10-29 07:42:06.000000000 -0700
@@ -396,7 +396,7 @@
  * the wrong IRQ line, causing any devices sharing the the line it's
  * *supposed* to use to be disabled by the kernel's IRQ debug code.
  */
-static u16 toshiba_line_size;
+static u16 __devinitdata toshiba_line_size;
 
 static struct dmi_system_id __devinitdata toshiba_ohci1394_dmi_table[] = {
 	{

Re: [PATCH] toshiba_ohci1394_dmi_table should be __devinitdata, not __devinit

[Greg KH]

On Sat, Oct 29, 2005 at 07:43:59AM -0700, Jesse Barnes wrote:
> On Friday, October 28, 2005 9:50 pm, Roland Dreier wrote:
> > I don't really understand why gcc gives the error it does, but
> > without this patch, when building with CONFIG_HOTPLUG=n, I get errors
> > like:
> >
> >       CC      arch/x86_64/pci/../../i386/pci/fixup.o
> >     arch/x86_64/pci/../../i386/pci/fixup.c: In function
> > `pci_fixup_i450nx': arch/x86_64/pci/../../i386/pci/fixup.c:13: error:
> > pci_fixup_i450nx causes a section type conflict
> >
> > The change is obviously correct: an array should be declared
> > __devinitdata rather that __devinit.
> 
> Oops, yeah I think this is correct.  We should also mark 
> toshiba_line_size as __devinitdata.  Patch relative to yours.

Why?  Is it really worth it?  2 bytes?  Ick.

It's time to just make CONFIG_HOTPLUG always on to keep messes like this
from happening...

thanks,

greg k-h

Re: [PATCH] toshiba_ohci1394_dmi_table should be __devinitdata, not __devinit

[Jesse Barnes]

On Saturday, October 29, 2005 12:57 pm, Greg KH wrote:
> > Oops, yeah I think this is correct.  We should also mark
> > toshiba_line_size as __devinitdata.  Patch relative to yours.
>
> Why?  Is it really worth it?  2 bytes?  Ick.

More for consistency than anything else.  No biggie.

> It's time to just make CONFIG_HOTPLUG always on to keep messes like
> this from happening...

Fine with me!

Jesse