Messages in this thread |  | | | Date | Tue, 13 Sep 2011 01:01:58 -0700 | | From | Andrew Morton <> | | Subject | Re: [PATCH -v2] netconsole: switch init_netconsole() to late_initcall if build-in |
| |
On Tue, 13 Sep 2011 15:45:39 +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. > > Andrew Morton suggested to fix this with initcall ordering. > Fixes it by switching init_netconsole() to late_initcall if 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 */
The ifdefs (which should have used CONFIG_MODULE) aren't needed. Because late_initcall() and module_init() are identical if CONFIG_MODULE, and because one day we might want to run the exitcalls for built-in code (UML actually does this at present).
|  |