From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755509Ab1IMIbU (ORCPT ); Tue, 13 Sep 2011 04:31:20 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:43405 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753596Ab1IMIbT (ORCPT ); Tue, 13 Sep 2011 04:31:19 -0400 Date: Tue, 13 Sep 2011 01:01:58 -0700 From: Andrew Morton To: Lin Ming Cc: "David S. Miller" , lkml , netdev@vger.kernel.org, Jeff Kirsher Subject: Re: [PATCH -v2] netconsole: switch init_netconsole() to late_initcall if build-in Message-Id: <20110913010158.1652cdee.akpm@linux-foundation.org> In-Reply-To: <1315899939.3402.2.camel@snb> References: <1315899939.3402.2.camel@snb> X-Mailer: Sylpheed 2.7.1 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 13 Sep 2011 15:45:39 +0800 Lin Ming 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 > --- > 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).