Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1722650
| From | Greg KH <gregkh@linuxfoundation.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 net-next] irda: fix link order if IRDA is built into the kernel |
| Date | 2017-08-29 19:50 +0200 |
| Message-ID | <ujSOd-5C2-7@gated-at.bofh.it> (permalink) |
| References | <ujIOS-7YQ-7@gated-at.bofh.it> <ujKQG-L5-17@gated-at.bofh.it> <ujRIu-4WZ-19@gated-at.bofh.it> <ujSuR-5uV-11@gated-at.bofh.it> <ujSEy-5y1-21@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH net-next] staging: irda: update MAINTAINERS Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-29 09:10 +0200
[PATCH net-next] staging: irda: force to be a kernel module Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-29 11:20 +0200
Re: [PATCH net-next] staging: irda: force to be a kernel module David Miller <davem@davemloft.net> - 2017-08-29 18:40 +0200
Re: [PATCH net-next] staging: irda: force to be a kernel module Greg KH <gregkh@linuxfoundation.org> - 2017-08-29 19:30 +0200
Re: [PATCH net-next] staging: irda: force to be a kernel module Greg KH <gregkh@linuxfoundation.org> - 2017-08-29 19:40 +0200
Re: [PATCH v2 net-next] irda: fix link order if IRDA is built into the kernel David Miller <davem@davemloft.net> - 2017-08-29 19:50 +0200
Re: [PATCH v2 net-next] irda: fix link order if IRDA is built into the kernel Greg KH <gregkh@linuxfoundation.org> - 2017-08-29 21:10 +0200
[PATCH v2 net-next] irda: fix link order if IRDA is built into the kernel Greg KH <gregkh@linuxfoundation.org> - 2017-08-29 19:50 +0200
[PATCH v3 net-next] staging: irda: fix init level for irda core Greg KH <gregkh@linuxfoundation.org> - 2017-08-30 13:20 +0200
Re: [PATCH v3 net-next] staging: irda: fix init level for irda core David Miller <davem@davemloft.net> - 2017-08-30 19:20 +0200
Re: [PATCH net-next] staging: irda: force to be a kernel module David Miller <davem@davemloft.net> - 2017-08-29 19:50 +0200
Re: [PATCH net-next] staging: irda: update MAINTAINERS David Miller <davem@davemloft.net> - 2017-08-29 18:40 +0200
csiph-web