2003-03-27 22:04:15

by Adrian Bunk

[permalink] [raw]
Subject: [patch] fix atm/iphase.c .text.exit error

The function ia_remove_one in drivers/atm/iphase.c is __devexit but the
pointer to it doesn't use __devexit_p resulting in a .text.exit error if
!CONFIG_HOTPLUG.

The following patch is needed:


--- linux-2.4.21-pre6-full-nohotplug/drivers/atm/iphase.c.old 2003-03-27 22:45:31.000000000 +0100
+++ linux-2.4.21-pre6-full-nohotplug/drivers/atm/iphase.c 2003-03-27 22:46:28.000000000 +0100
@@ -3322,7 +3322,7 @@
.name = DEV_LABEL,
.id_table = ia_pci_tbl,
.probe = ia_init_one,
- .remove = ia_remove_one,
+ .remove = __devexit_p(ia_remove_one),
};

static int __init ia_init_module(void)


This patch applies against 2.4.21-pre6 and 2.5.66. I've tested the
compilation with 2.4.21-pre6.

Please apply
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed


2003-03-31 19:57:28

by chas williams

[permalink] [raw]
Subject: Re: [patch] fix atm/iphase.c .text.exit error

please apply this to 2.4 and 2.5. thanks in advance.

In message <[email protected]>,Adrian Bunk writes:
>The function ia_remove_one in drivers/atm/iphase.c is __devexit but the
>pointer to it doesn't use __devexit_p resulting in a .text.exit error if
>!CONFIG_HOTPLUG.
>
>The following patch is needed:
>
>
>--- linux-2.4.21-pre6-full-nohotplug/drivers/atm/iphase.c.old 2003-03-27 22:4
>5:31.000000000 +0100
>+++ linux-2.4.21-pre6-full-nohotplug/drivers/atm/iphase.c 2003-03-27 22:4
>6:28.000000000 +0100
>@@ -3322,7 +3322,7 @@
> .name = DEV_LABEL,
> .id_table = ia_pci_tbl,
> .probe = ia_init_one,
>- .remove = ia_remove_one,
>+ .remove = __devexit_p(ia_remove_one),
> };
>
> static int __init ia_init_module(void)
>
>
>This patch applies against 2.4.21-pre6 and 2.5.66. I've tested the
>compilation with 2.4.21-pre6.
>
>Please apply
>Adrian
>
>--
>
> "Is there not promise of rain?" Ling Tan asked suddenly out
> of the darkness. There had been need of rain for many days.
> "Only a promise," Lao Er said.
> Pearl S. Buck - Dragon Seed
>
>

2003-03-31 21:30:27

by David Miller

[permalink] [raw]
Subject: Re: [patch] fix atm/iphase.c .text.exit error

From: chas williams <[email protected]>
Date: Mon, 31 Mar 2003 15:05:35 -0500

please apply this to 2.4 and 2.5. thanks in advance.

Done.