* [PATCH -next] bluetooth: fix build break
@ 2011-02-22 7:13 Anand Gadiyar
2011-02-22 12:14 ` Gustavo F. Padovan
0 siblings, 1 reply; 2+ messages in thread
From: Anand Gadiyar @ 2011-02-22 7:13 UTC (permalink / raw)
To: linux-bluetooth, linux-next; +Cc: Anand Gadiyar, Gustavo F. Padovan
Linux-next as of 20110217 complains when building for OMAP1.
LD vmlinux
`hci_sock_cleanup' referenced in section `.init.text' of net/built-in.o: defined in discarded section `.exit.text' of net/built-in.o
`hci_sock_cleanup' referenced in section `.init.text' of net/built-in.o: defined in discarded section `.exit.text' of net/built-in.o
make: *** [vmlinux] Error 1
A recent patch by Gustavo (Bluetooth: Merge L2CAP and SCO modules
into bluetooth.ko) introduced this by calling the hci_sock_cleanup
function in the error path of bt_init.
Fix this by dropping the __exit marking for hci_sock_cleanup.
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Cc: Gustavo F. Padovan <padovan@profusion.mobi>
---
net/bluetooth/hci_sock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-omap-usb/net/bluetooth/hci_sock.c
===================================================================
--- linux-omap-usb.orig/net/bluetooth/hci_sock.c
+++ linux-omap-usb/net/bluetooth/hci_sock.c
@@ -861,7 +861,7 @@ error:
return err;
}
-void __exit hci_sock_cleanup(void)
+void hci_sock_cleanup(void)
{
if (bt_sock_unregister(BTPROTO_HCI) < 0)
BT_ERR("HCI socket unregistration failed");
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH -next] bluetooth: fix build break
2011-02-22 7:13 [PATCH -next] bluetooth: fix build break Anand Gadiyar
@ 2011-02-22 12:14 ` Gustavo F. Padovan
0 siblings, 0 replies; 2+ messages in thread
From: Gustavo F. Padovan @ 2011-02-22 12:14 UTC (permalink / raw)
To: Anand Gadiyar; +Cc: linux-bluetooth, linux-next
Hi Anand,
* Anand Gadiyar <gadiyar@ti.com> [2011-02-22 12:43:09 +0530]:
> Linux-next as of 20110217 complains when building for OMAP1.
>
> LD vmlinux
> `hci_sock_cleanup' referenced in section `.init.text' of net/built-in.o: defined in discarded section `.exit.text' of net/built-in.o
> `hci_sock_cleanup' referenced in section `.init.text' of net/built-in.o: defined in discarded section `.exit.text' of net/built-in.o
> make: *** [vmlinux] Error 1
>
> A recent patch by Gustavo (Bluetooth: Merge L2CAP and SCO modules
> into bluetooth.ko) introduced this by calling the hci_sock_cleanup
> function in the error path of bt_init.
>
> Fix this by dropping the __exit marking for hci_sock_cleanup.
>
> Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
> Cc: Gustavo F. Padovan <padovan@profusion.mobi>
> ---
> net/bluetooth/hci_sock.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
I didn't catch on my system, applied. Thanks for fixing this.
--
Gustavo F. Padovan
http://profusion.mobi
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-02-22 12:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-22 7:13 [PATCH -next] bluetooth: fix build break Anand Gadiyar
2011-02-22 12:14 ` Gustavo F. Padovan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).