diff options
author | Samuel Ortiz <samuel@sortiz.org> | 2007-07-18 05:16:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-07-18 05:16:30 -0400 |
commit | 75a69ac6d66d2504ecbc4b46645fb0835a55a57c (patch) | |
tree | df2b3ee737b93f7cc6fe517d565cca1d579c2533 /net/irda/irda_device.c | |
parent | 83ca46e7ac7b2883ae7d02503a01e8f1578afe4e (diff) |
[IrDA]: Fix IrDA build failure
When having built-in IrDA, we hit the following error:
`irda_sysctl_unregister' referenced in section `.init.text' of
net/built-in.o: defined in discarded section `.exit.text' of
net/built-in.o
`irda_proc_unregister' referenced in section `.init.text' of
net/built-in.o: defined in discarded section `.exit.text' of
net/built-in.o
`irsock_cleanup' referenced in section `.init.text' of net/built-in.o:
defined in discarded section `.exit.text' of net/built-in.o
`irttp_cleanup' referenced in section `.init.text' of net/built-in.o:
defined in discarded section `.exit.text' of net/built-in.o
`iriap_cleanup' referenced in section `.init.text' of net/built-in.o:
defined in discarded section `.exit.text' of net/built-in.o
`irda_device_cleanup' referenced in section `.init.text' of
net/built-in.o: defined in discarded section `.exit.text' of
net/built-in.o
`irlap_cleanup' referenced in section `.init.text' of net/built-in.o:
defined in discarded section `.exit.text' of net/built-in.o
`irlmp_cleanup' referenced in section `.init.text' of net/built-in.o:
defined in discarded section `.exit.text' of net/built-in.o
make[1]: *** [.tmp_vmlinux1] Error 1
make: *** [_all] Error 2
This is due to the irda_init fix recently added, where we call __exit
routines from an __init one. It is a build failure that I didn't catch
because it doesn't show up when building IrDA as a module. My apologies
for that.
The following patch fixes that failure and is against your net-2.6
tree. I hope it can make it to the merge window, and stable@kernel.org
is CCed on this mail.
Signed-off-by: Samuel Ortiz <samuel@sortiz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda/irda_device.c')
-rw-r--r-- | net/irda/irda_device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/irda/irda_device.c b/net/irda/irda_device.c index 7b5def1ea633..435b563d29a6 100644 --- a/net/irda/irda_device.c +++ b/net/irda/irda_device.c | |||
@@ -95,14 +95,14 @@ int __init irda_device_init( void) | |||
95 | return 0; | 95 | return 0; |
96 | } | 96 | } |
97 | 97 | ||
98 | static void __exit leftover_dongle(void *arg) | 98 | static void leftover_dongle(void *arg) |
99 | { | 99 | { |
100 | struct dongle_reg *reg = arg; | 100 | struct dongle_reg *reg = arg; |
101 | IRDA_WARNING("IrDA: Dongle type %x not unregistered\n", | 101 | IRDA_WARNING("IrDA: Dongle type %x not unregistered\n", |
102 | reg->type); | 102 | reg->type); |
103 | } | 103 | } |
104 | 104 | ||
105 | void __exit irda_device_cleanup(void) | 105 | void irda_device_cleanup(void) |
106 | { | 106 | { |
107 | IRDA_DEBUG(4, "%s()\n", __FUNCTION__); | 107 | IRDA_DEBUG(4, "%s()\n", __FUNCTION__); |
108 | 108 | ||