[PATCH] via-rhine: references __init code during resume

[PATCH] via-rhine: references __init code during resume

[Randy.Dunlap]

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


-- 
~Randy

[-- Attachment #2: via_rhine_mmio.patch --]
[-- Type: text/x-patch, Size: 809 bytes --]


Fix __init section usage:
rhine_resume calls enable_mmio, so latter cannot be __devinit;
Error: ./drivers/net/via-rhine.o .text refers to 0000000000000925 R_X86_64_PC32     .init.text+0xfffffffffffffffc

Signed-off-by: Randy Dunlap <rddunlap@osdl.org>

diffstat:=
 drivers/net/via-rhine.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -Naurp ./drivers/net/via-rhine.c~via_rhine_mmio ./drivers/net/via-rhine.c
--- ./drivers/net/via-rhine.c~via_rhine_mmio	2004-10-18 14:55:28.000000000 -0700
+++ ./drivers/net/via-rhine.c	2004-10-22 10:10:58.928311448 -0700
@@ -627,7 +627,7 @@ static void rhine_chip_reset(struct net_
 }
 
 #ifdef USE_MMIO
-static void __devinit enable_mmio(long pioaddr, u32 quirks)
+static void enable_mmio(long pioaddr, u32 quirks)
 {
 	int n;
 	if (quirks & rqRhineI) {

Re: [PATCH] via-rhine: references __init code during resume

[Jeff Garzik]

Randy.Dunlap wrote:
> 
> 
> ------------------------------------------------------------------------
> 
> 
> Fix __init section usage:
> rhine_resume calls enable_mmio, so latter cannot be __devinit;
> Error: ./drivers/net/via-rhine.o .text refers to 0000000000000925 R_X86_64_PC32     .init.text+0xfffffffffffffffc
> 
> Signed-off-by: Randy Dunlap <rddunlap@osdl.org>

Attaching patches in this way breaks Linus's patch merge scripts (which 
I use), causing the description to be completely omitted.

Please include descriptions and patches inline.  "sendmail -t < mail" 
works well for this.  You need only supply the From, To, and Subject 
headers, and a blank line, in order for this to work.

	Jeff

[PATCH] via-rhine: references __init code during resume

[Randy.Dunlap]

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

[Does it work if the patch description is inline & the
patch is attached?]


Fix __init section usage:
rhine_resume calls enable_mmio, so latter cannot be __devinit;
Error: ./drivers/net/via-rhine.o .text refers to 0000000000000925 
R_X86_64_PC32     .init.text+0xfffffffffffffffc

Signed-off-by: Randy Dunlap <rddunlap@osdl.org>

diffstat:=
  drivers/net/via-rhine.c |    2 +-
  1 files changed, 1 insertion(+), 1 deletion(-)

-- 
~Randy

[-- Attachment #2: via_rhine_mmio.patch --]
[-- Type: text/x-patch, Size: 460 bytes --]

diff -Naurp ./drivers/net/via-rhine.c~via_rhine_mmio ./drivers/net/via-rhine.c
--- ./drivers/net/via-rhine.c~via_rhine_mmio	2004-10-18 14:55:28.000000000 -0700
+++ ./drivers/net/via-rhine.c	2004-10-22 10:10:58.928311448 -0700
@@ -627,7 +627,7 @@ static void rhine_chip_reset(struct net_
 }
 
 #ifdef USE_MMIO
-static void __devinit enable_mmio(long pioaddr, u32 quirks)
+static void enable_mmio(long pioaddr, u32 quirks)
 {
 	int n;
 	if (quirks & rqRhineI) {

Re: [PATCH] via-rhine: references __init code during resume

[Jeff Garzik]

[jgarzik@pretzel net-drivers-2.6]$ dotest < /g/tmp/mbox
bk import -tpatch -CR -yvia-rhine: references __init code during resume 
/tmp/patch21199 .
Patching...
Patch failed.  **** patch log follows ****
Patching file drivers/net/via-rhine.c
1 out of 1 hunk FAILED -- saving rejects to file drivers/net/via-rhine.c.rej