Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756052AbbHZCOb (ORCPT ); Tue, 25 Aug 2015 22:14:31 -0400 Received: from mail.windriver.com ([147.11.1.11]:53910 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753058AbbHZCOa (ORCPT ); Tue, 25 Aug 2015 22:14:30 -0400 From: Paul Gortmaker To: CC: Paul Gortmaker , Rusty Russell Subject: [PATCH] kernel: make module.c itself more explicitly non-modular Date: Tue, 25 Aug 2015 22:12:35 -0400 Message-ID: <1440555155-11273-1-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.5.0 MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1874 Lines: 53 The Kconfig currently controlling compilation of this code is: menuconfig MODULES bool "Enable loadable module support" ...meaning that it currently is not being built as a module by anyone. No surprise here, since modular support being a module would be an interesting chicken before the egg problem. Lets remove the use of module_init in this code so that when reading the file, there is less doubt that it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. However one could argue that fs_initcall makes more sense for proc stuff, and we can change the initcall order later and watch for fallout if so desired. We can't of course delete the module.h include in this case since it is used all through the rest of the file. Cc: Rusty Russell Signed-off-by: Paul Gortmaker --- [I was undecided as to whether we should do this in one step or two, i.e. instead just make the change to fs_initcall here and now, and so went with the more cautious/granular approach.] kernel/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/module.c b/kernel/module.c index 8f051a106676..7750bdcb12fc 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3947,7 +3947,7 @@ static int __init proc_modules_init(void) proc_create("modules", 0, NULL, &proc_modules_operations); return 0; } -module_init(proc_modules_init); +device_initcall(proc_modules_init); #endif /* Given an address, look for it in the module exception tables. */ -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/