2005-03-13 23:06:44

by maximilian attems

Subject: [patch] w6692 eliminate bad section references

Fix w6692 section references:
convert __initdata to __devinitdata.

Error: ./drivers/isdn/hisax/w6692.o .text refers to 0000002f R_386_32
.init.data

Signed-off-by: maximilian attems <[email protected]>


diff -pruN -X dontdiff linux-2.6.11-bk8/drivers/isdn/hisax/w6692.c
linux-2.6.11-bk8-max/drivers/isdn/hisax/w6692.c
--- linux-2.6.11-bk8/drivers/isdn/hisax/w6692.c 2005-03-02 08:38:25.000000000 +0100
+++ linux-2.6.11-bk8-max/drivers/isdn/hisax/w6692.c 2005-03-13 23:36:34.000000000 +0100
@@ -45,7 +45,7 @@ const char *w6692_revision = "$Revision:

#define DBUSY_TIMER_VALUE 80

-static char *W6692Ver[] __initdata =
+static char *W6692Ver[] __devinitdata =
{"W6692 V00", "W6692 V01", "W6692 V10",
"W6692 V11"};

2005-03-14 22:24:03

by Randy.Dunlap

Subject: Re: [patch] w6692 eliminate bad section references

maximilian attems wrote:
> Fix w6692 section references:
> convert __initdata to __devinitdata.
>
> Error: ./drivers/isdn/hisax/w6692.o .text refers to 0000002f R_386_32
> .init.data
>
> Signed-off-by: maximilian attems <[email protected]>
>
>
> diff -pruN -X dontdiff linux-2.6.11-bk8/drivers/isdn/hisax/w6692.c
> linux-2.6.11-bk8-max/drivers/isdn/hisax/w6692.c
> --- linux-2.6.11-bk8/drivers/isdn/hisax/w6692.c 2005-03-02 08:38:25.000000000 +0100
> +++ linux-2.6.11-bk8-max/drivers/isdn/hisax/w6692.c 2005-03-13 23:36:34.000000000 +0100
> @@ -45,7 +45,7 @@ const char *w6692_revision = "$Revision:
>
> #define DBUSY_TIMER_VALUE 80
>
> -static char *W6692Ver[] __initdata =
> +static char *W6692Ver[] __devinitdata =
> {"W6692 V00", "W6692 V01", "W6692 V10",
> "W6692 V11"};
>

I think the correct fix is to make W6692Version() be __init ...
What do you think of that?

--
~Randy

2005-03-15 13:39:55

by maximilian attems

Subject: Re: [patch] w6692 eliminate bad section references

On Mon, 14 Mar 2005, Randy.Dunlap wrote:

> maximilian attems wrote:
> >Fix w6692 section references:
> > convert __initdata to __devinitdata.
> >
> >Error: ./drivers/isdn/hisax/w6692.o .text refers to 0000002f R_386_32
> >.init.data
> >
> I think the correct fix is to make W6692Version() be __init ...
> What do you think of that?
>
> --
> ~Randy

thanks a lot for your review!
you are right much better, added __init to W6692Version().

#Signed-off-by: maximilian attems <[email protected]>

diff -pruN -X dontdiff linux-2.6.11-bk8/drivers/isdn/hisax/w6692.c
linux-2.6.11-bk8-max/drivers/isdn/hisax/w6692.c
--- linux-2.6.11-bk8/drivers/isdn/hisax/w6692.c 2005-03-02 08:38:25.000000000 +0100
+++ linux-2.6.11-bk8-max/drivers/isdn/hisax/w6692.c 2005-03-15 14:01:14.000000000 +0100
@@ -49,7 +49,7 @@ static char *W6692Ver[] __initdata =
{"W6692 V00", "W6692 V01", "W6692 V10",
"W6692 V11"};

-static void
+static void __init
W6692Version(struct IsdnCardState *cs, char *s)
{
int val;

2005-03-15 15:40:17

by Randy.Dunlap

Subject: Re: [patch] w6692 eliminate bad section references

maximilian attems wrote:
>
> thanks a lot for your review!
> you are right much better, added __init to W6692Version().
>
> #Signed-off-by: maximilian attems <[email protected]>

Acked-by: Randy Dunlap <[email protected]>

> diff -pruN -X dontdiff linux-2.6.11-bk8/drivers/isdn/hisax/w6692.c
> linux-2.6.11-bk8-max/drivers/isdn/hisax/w6692.c
> --- linux-2.6.11-bk8/drivers/isdn/hisax/w6692.c 2005-03-02 08:38:25.000000000 +0100
> +++ linux-2.6.11-bk8-max/drivers/isdn/hisax/w6692.c 2005-03-15 14:01:14.000000000 +0100
> @@ -49,7 +49,7 @@ static char *W6692Ver[] __initdata =
> {"W6692 V00", "W6692 V01", "W6692 V10",
> "W6692 V11"};
>
> -static void
> +static void __init
> W6692Version(struct IsdnCardState *cs, char *s)
> {
> int val;


--
~Randy