diff options
| author | Lin Ming <ming.m.lin@intel.com> | 2011-09-20 21:45:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-20 21:45:07 +0200 |
| commit | 97c7de055713afddf4218f19c896b5185555da15 (patch) | |
| tree | b1fddc5a24a7556a3c957350eeb4ff46642c70a9 /drivers/net | |
| parent | gianfar: Fix overflow check and return value for gfar_get_cls_all() (diff) | |
| download | linux-97c7de055713afddf4218f19c896b5185555da15.tar.xz linux-97c7de055713afddf4218f19c896b5185555da15.zip | |
netconsole: switch init_netconsole() to late_initcall
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.
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/netconsole.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index dfc82720065a..ed2a3977c6e7 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -799,5 +799,11 @@ static void __exit cleanup_netconsole(void) } } -module_init(init_netconsole); +/* + * Use late_initcall to ensure netconsole is + * initialized after network device driver if built-in. + * + * late_initcall() and module_init() are identical if built as module. + */ +late_initcall(init_netconsole); module_exit(cleanup_netconsole); |