Skip to contentSkip to conversation

via-rhine: references __init code during resume

PATCH In review Randy.Dunlap 2 participants 4 messages Oct 22, 2004 – Nov 5, 2004

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 via-rhine: references __init code during resume

Signature · 2 lines
-- 
~Randy

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

diffstat:=

 drivers/net/via-rhine.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)
drivers/net/via-rhine.c renamed from drivers/net/via-rhine.c~via_rhine_mmio +1 -1
diff -Naurp ./drivers/net/via-rhine.c~via_rhine_mmio ./drivers/net/via-rhine.c
@@ -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) {
#1 lore raw
Quoted 10 lines · Randy.Dunlap

------------------------------------------------------------------------

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

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

#2 lore raw

PATCH 1/1 via-rhine: references __init code during resume

[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

diffstat:=

 drivers/net/via-rhine.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
~Randy
drivers/net/via-rhine.c renamed from drivers/net/via-rhine.c~via_rhine_mmio +1 -1
diff -Naurp ./drivers/net/via-rhine.c~via_rhine_mmio ./drivers/net/via-rhine.c
@@ -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) {
#3 lore raw

[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