From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751301AbdH2RqT (ORCPT ); Tue, 29 Aug 2017 13:46:19 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:53266 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750909AbdH2RqQ (ORCPT ); Tue, 29 Aug 2017 13:46:16 -0400 Date: Tue, 29 Aug 2017 19:46:22 +0200 From: Greg KH To: David Miller Cc: devel@driverdev.osuosl.org, netdev@vger.kernel.org, samuel@sortiz.org, linux-kernel@vger.kernel.org, kernel test robot , Geert Uytterhoeven Subject: [PATCH v2 net-next] irda: fix link order if IRDA is built into the kernel Message-ID: <20170829174622.GA25926@kroah.com> References: <20170829070929.GA15824@kroah.com> <20170829091417.GA9481@kroah.com> <20170829.093507.2166038228205751885.davem@davemloft.net> <20170829172608.GA4700@kroah.com> <20170829173129.GA11029@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170829173129.GA11029@kroah.com> User-Agent: Mutt/1.8.3 (2017-05-23) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Reported-by: Geert Uytterhoeven 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