public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Anand Gadiyar <gadiyar-l0cyMroinI0@public•gmane.org>
To: linux-bluetooth-u79uwXL29TY76Z2rM5mHXA@public•gmane.org,
	linux-next-u79uwXL29TY76Z2rM5mHXA@public•gmane.org
Cc: Anand Gadiyar <gadiyar-l0cyMroinI0@public•gmane.org>,
	"Gustavo F. Padovan"
	<padovan-Y3ZbgMPKUGA34EUeqzHoZw@public•gmane.org>
Subject: [PATCH -next] bluetooth: fix build break
Date: Tue, 22 Feb 2011 12:43:09 +0530	[thread overview]
Message-ID: <1298358789-13202-1-git-send-email-gadiyar@ti.com> (raw)

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-l0cyMroinI0@public•gmane.org>
Cc: Gustavo F. Padovan <padovan-Y3ZbgMPKUGA34EUeqzHoZw@public•gmane.org>
---
 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");

             reply	other threads:[~2011-02-22  7:13 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-22  7:13 Anand Gadiyar [this message]
2011-02-22 12:14 ` [PATCH -next] bluetooth: fix build break Gustavo F. Padovan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1298358789-13202-1-git-send-email-gadiyar@ti.com \
    --to=gadiyar-l0cymroini0@public$(echo .)gmane.org \
    --cc=linux-bluetooth-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
    --cc=linux-next-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
    --cc=padovan-Y3ZbgMPKUGA34EUeqzHoZw@public$(echo .)gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox