Re: [PATCH -next] drivers/net: Makefile, fix netconsole link order
flat view
From: Andrew Morton <akpm@linux-foundation.org>
Date: 2011-09-10 00:00:31
Also in:
lkml
On Tue, 06 Sep 2011 16:35:29 +0800 Lin Ming [off-list ref] wrote:
quoted hunk ↗ jump to hunk
Commit 88491d8(drivers/net: Kconfig & Makefile cleanup) causes a regression that netconsole does not work if netconsole and network device driver are build into kernel, because netconsole is linked before network device driver. Fixes it by moving netconsole.o after network device driver. Signed-off-by: Lin Ming <redacted> --- drivers/net/Makefile | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)diff --git a/drivers/net/Makefile b/drivers/net/Makefile index fa877cd..ec15311 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile@@ -14,7 +14,6 @@ obj-$(CONFIG_MACVTAP) += macvtap.o obj-$(CONFIG_MII) += mii.o obj-$(CONFIG_MDIO) += mdio.o obj-$(CONFIG_NET) += Space.o loopback.o -obj-$(CONFIG_NETCONSOLE) += netconsole.o obj-$(CONFIG_PHYLIB) += phy/ obj-$(CONFIG_RIONET) += rionet.o obj-$(CONFIG_TUN) += tun.o@@ -66,3 +65,9 @@ obj-$(CONFIG_USB_USBNET) += usb/ obj-$(CONFIG_USB_ZD1201) += usb/ obj-$(CONFIG_USB_IPHETH) += usb/ obj-$(CONFIG_USB_CDC_PHONET) += usb/ + +# +# If netconsole and network device driver are build-in, +# netconsole must be linked after network device driver +# +obj-$(CONFIG_NETCONSOLE) += netconsole.o
It would be preferable to fix this with initcall ordering. Perhaps by switching init_netconsole() to subsys_initcall.