2011-02-22 07:13:09

by Anand Gadiyar

Subject: [PATCH -next] bluetooth: fix build break

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 <[email protected]>
Cc: Gustavo F. Padovan <[email protected]>
---
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");

2011-02-22 12:14:22

by Gustavo Padovan

Subject: Re: [PATCH -next] bluetooth: fix build break

Hi Anand,

* Anand Gadiyar <[email protected]> [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 <[email protected]>
> Cc: Gustavo F. Padovan <[email protected]>
> ---
> 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