* [PATCH -next] drivers/net: Makefile, fix netconsole link order @ 2011-09-06 8:35 Lin Ming 2011-09-10 0:00 ` Andrew Morton 0 siblings, 1 reply; 5+ messages in thread From: Lin Ming @ 2011-09-06 8:35 UTC (permalink / raw) To: David S. Miller; +Cc: lkml, netdev, Jeff Kirsher 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 <ming.m.lin@intel.com> --- 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 -- 1.7.2.5 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH -next] drivers/net: Makefile, fix netconsole link order 2011-09-06 8:35 [PATCH -next] drivers/net: Makefile, fix netconsole link order Lin Ming @ 2011-09-10 0:00 ` Andrew Morton 2011-09-10 2:43 ` Lin Ming 0 siblings, 1 reply; 5+ messages in thread From: Andrew Morton @ 2011-09-10 0:00 UTC (permalink / raw) To: Lin Ming; +Cc: David S. Miller, lkml, netdev, Jeff Kirsher On Tue, 06 Sep 2011 16:35:29 +0800 Lin Ming <ming.m.lin@intel.com> wrote: > 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 <ming.m.lin@intel.com> > --- > 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. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH -next] drivers/net: Makefile, fix netconsole link order 2011-09-10 0:00 ` Andrew Morton @ 2011-09-10 2:43 ` Lin Ming 2011-09-10 4:10 ` Andrew Morton 0 siblings, 1 reply; 5+ messages in thread From: Lin Ming @ 2011-09-10 2:43 UTC (permalink / raw) To: Andrew Morton Cc: David S. Miller, lkml, netdev@vger.kernel.org, Kirsher, Jeffrey T On Sat, 2011-09-10 at 08:00 +0800, Andrew Morton wrote: > On Tue, 06 Sep 2011 16:35:29 +0800 > Lin Ming <ming.m.lin@intel.com> wrote: > > > 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 <ming.m.lin@intel.com> > > --- > > 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. subsys_initcall is defined as __define_initcall("4",fn,4). In !MODULE case, device driver module_int() is defined as __define_initcall("6",fn,6) If we use subsys_initcall for init_netconsole, it will still be called before network device driver is initialized. How about late_initcall? (Not tested yet) >From 11f4f035e96ff430192d0a75552dd715acb5f3b8 Mon Sep 17 00:00:00 2001 From: Lin Ming <ming.m.lin@intel.com> Date: Sat, 10 Sep 2011 10:36:10 +0800 Subject: [PATCH] drivers/net: Makefile, fix netconsole link order 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 switching init_netconsole() to late_initcall if it's build-in. Signed-off-by: Lin Ming <ming.m.lin@intel.com> --- drivers/net/netconsole.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index dfc8272..914be29 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -799,5 +799,9 @@ static void __exit cleanup_netconsole(void) } } +#ifdef MODULE module_init(init_netconsole); module_exit(cleanup_netconsole); +#else +late_initcall(init_netconsole); +#endif /* !MODULE */ -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH -next] drivers/net: Makefile, fix netconsole link order 2011-09-10 2:43 ` Lin Ming @ 2011-09-10 4:10 ` Andrew Morton 2011-09-10 4:26 ` Lin Ming 0 siblings, 1 reply; 5+ messages in thread From: Andrew Morton @ 2011-09-10 4:10 UTC (permalink / raw) To: Lin Ming Cc: David S. Miller, lkml, netdev@vger.kernel.org, Kirsher, Jeffrey T On Sat, 10 Sep 2011 10:43:32 +0800 Lin Ming <ming.m.lin@intel.com> wrote: > On Sat, 2011-09-10 at 08:00 +0800, Andrew Morton wrote: > > > > +obj-$(CONFIG_NETCONSOLE) += netconsole.o > > > > It would be preferable to fix this with initcall ordering. Perhaps by > > switching init_netconsole() to subsys_initcall. > > subsys_initcall is defined as __define_initcall("4",fn,4). > In !MODULE case, device driver module_int() is defined as > __define_initcall("6",fn,6) oop, yes, I am chronologically challenged. > If we use subsys_initcall for init_netconsole, it will still be called > before network device driver is initialized. > > How about late_initcall? > > (Not tested yet) > > >From 11f4f035e96ff430192d0a75552dd715acb5f3b8 Mon Sep 17 00:00:00 2001 > From: Lin Ming <ming.m.lin@intel.com> > Date: Sat, 10 Sep 2011 10:36:10 +0800 > Subject: [PATCH] drivers/net: Makefile, fix netconsole link order > > 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 switching init_netconsole() to late_initcall if it's > build-in. > > Signed-off-by: Lin Ming <ming.m.lin@intel.com> > --- > drivers/net/netconsole.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c > index dfc8272..914be29 100644 > --- a/drivers/net/netconsole.c > +++ b/drivers/net/netconsole.c > @@ -799,5 +799,9 @@ static void __exit cleanup_netconsole(void) > } > } > > +#ifdef MODULE > module_init(init_netconsole); > module_exit(cleanup_netconsole); > +#else > +late_initcall(init_netconsole); > +#endif /* !MODULE */ That should work, unless any net driver is weirdly also using late_initcall. But if there are such drivers, they would have failed with the old Makefile ordering. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH -next] drivers/net: Makefile, fix netconsole link order 2011-09-10 4:10 ` Andrew Morton @ 2011-09-10 4:26 ` Lin Ming 0 siblings, 0 replies; 5+ messages in thread From: Lin Ming @ 2011-09-10 4:26 UTC (permalink / raw) To: Andrew Morton Cc: David S. Miller, lkml, netdev@vger.kernel.org, Kirsher, Jeffrey T On Sat, 2011-09-10 at 12:10 +0800, Andrew Morton wrote: > On Sat, 10 Sep 2011 10:43:32 +0800 Lin Ming <ming.m.lin@intel.com> wrote: > > > On Sat, 2011-09-10 at 08:00 +0800, Andrew Morton wrote: > > > > > > +obj-$(CONFIG_NETCONSOLE) += netconsole.o > > > > > > It would be preferable to fix this with initcall ordering. Perhaps by > > > switching init_netconsole() to subsys_initcall. > > > > subsys_initcall is defined as __define_initcall("4",fn,4). > > In !MODULE case, device driver module_int() is defined as > > __define_initcall("6",fn,6) > > oop, yes, I am chronologically challenged. > > > If we use subsys_initcall for init_netconsole, it will still be called > > before network device driver is initialized. > > > > How about late_initcall? > > > > (Not tested yet) > > > > >From 11f4f035e96ff430192d0a75552dd715acb5f3b8 Mon Sep 17 00:00:00 2001 > > From: Lin Ming <ming.m.lin@intel.com> > > Date: Sat, 10 Sep 2011 10:36:10 +0800 > > Subject: [PATCH] drivers/net: Makefile, fix netconsole link order > > > > 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 switching init_netconsole() to late_initcall if it's > > build-in. > > > > Signed-off-by: Lin Ming <ming.m.lin@intel.com> > > --- > > drivers/net/netconsole.c | 4 ++++ > > 1 files changed, 4 insertions(+), 0 deletions(-) > > > > diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c > > index dfc8272..914be29 100644 > > --- a/drivers/net/netconsole.c > > +++ b/drivers/net/netconsole.c > > @@ -799,5 +799,9 @@ static void __exit cleanup_netconsole(void) > > } > > } > > > > +#ifdef MODULE > > module_init(init_netconsole); > > module_exit(cleanup_netconsole); > > +#else > > +late_initcall(init_netconsole); > > +#endif /* !MODULE */ > > That should work, unless any net driver is weirdly also using > late_initcall. But if there are such drivers, they would have failed > with the old Makefile ordering. Yes. BTW, may I get your ACK after testing this patch? Thanks. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-09-10 4:26 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-09-06 8:35 [PATCH -next] drivers/net: Makefile, fix netconsole link order Lin Ming 2011-09-10 0:00 ` Andrew Morton 2011-09-10 2:43 ` Lin Ming 2011-09-10 4:10 ` Andrew Morton 2011-09-10 4:26 ` Lin Ming
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).