From: Greg KH <gregkh@linuxfoundation.org>
To: David Miller <davem@davemloft.net>
Cc: devel@driverdev.osuosl.org, samuel@sortiz.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>,
kernel test robot <fengguang.wu@intel.com>
Subject: [PATCH v2 net-next] irda: fix link order if IRDA is built into the kernel
Date: Tue, 29 Aug 2017 19:46:22 +0200 [thread overview]
Message-ID: <20170829174622.GA25926@kroah.com> (raw)
In-Reply-To: <20170829173129.GA11029@kroah.com>
When moving the IRDA code out of net/ into drivers/staging/irda/net, the
link order changes when IRDA is built into the kernel. That causes a
kernel crash at boot time as netfilter isn't initialized yet.
To fix this, build and link the irda networking code in the same exact
order that it was previously before the move.
Reported-by: kernel test robot <fengguang.wu@intel.com>
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
---
v2 - don't force irda to be a module, make the Makefiles put irda back
where it was before in the link order.
drivers/staging/Makefile | 1 -
net/Makefile | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index fced929a0e67..1192caa94435 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -2,7 +2,6 @@
obj-y += media/
obj-y += typec/
-obj-$(CONFIG_IRDA) += irda/net/
obj-$(CONFIG_IRDA) += irda/drivers/
obj-$(CONFIG_PRISM2_USB) += wlan-ng/
obj-$(CONFIG_COMEDI) += comedi/
diff --git a/net/Makefile b/net/Makefile
index 3d3feff3643b..ddd059c3dfa4 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_NETROM) += netrom/
obj-$(CONFIG_ROSE) += rose/
obj-$(CONFIG_AX25) += ax25/
obj-$(CONFIG_CAN) += can/
+obj-$(CONFIG_IRDA) += ../drivers/staging/irda/net/
obj-$(CONFIG_BT) += bluetooth/
obj-$(CONFIG_SUNRPC) += sunrpc/
obj-$(CONFIG_AF_RXRPC) += rxrpc/
--
2.14.1
next prev parent reply other threads:[~2017-08-29 17:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-29 7:09 [PATCH net-next] staging: irda: update MAINTAINERS Greg Kroah-Hartman
2017-08-29 9:14 ` [PATCH net-next] staging: irda: force to be a kernel module Greg Kroah-Hartman
2017-08-29 16:35 ` David Miller
2017-08-29 17:26 ` Greg KH
2017-08-29 17:31 ` Greg KH
2017-08-29 17:46 ` Greg KH [this message]
2017-08-29 17:49 ` [PATCH v2 net-next] irda: fix link order if IRDA is built into the kernel David Miller
2017-08-29 19:05 ` Greg KH
2017-08-30 11:16 ` [PATCH v3 net-next] staging: irda: fix init level for irda core Greg KH
2017-08-30 17:15 ` David Miller
2017-08-29 17:40 ` [PATCH net-next] staging: irda: force to be a kernel module David Miller
2017-08-29 16:30 ` [PATCH net-next] staging: irda: update MAINTAINERS David Miller
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=20170829174622.GA25926@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=davem@davemloft.net \
--cc=devel@driverdev.osuosl.org \
--cc=fengguang.wu@intel.com \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=samuel@sortiz.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).