From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753916AbdARQUZ (ORCPT ); Wed, 18 Jan 2017 11:20:25 -0500 Received: from mail.windriver.com ([147.11.1.11]:52300 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751841AbdARQUX (ORCPT ); Wed, 18 Jan 2017 11:20:23 -0500 From: Paul Gortmaker To: CC: Paul Gortmaker , Kostenzer Felix , Andrew Morton Subject: [PATCH] lib: sort: make it explicitly non-modular Date: Wed, 18 Jan 2017 11:20:09 -0500 Message-ID: <20170118162009.24763-1-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.11.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 The Makefile currently controlling compilation of this code is: lib/Kconfig.debug:config TEST_SORT lib/Kconfig.debug: bool "Array-based sort test" and... lib/Makefile:obj-y += bcd.o div64.o sort.o [...] ...meaning that it currently is not being built as a module by anyone. Lets remove the couple traces of modular infrastructure use, so that when reading the code there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering becomes slightly earlier when we change it to use subsys_initcall as done here. However, since it is a self contained test, this shouldn't be an issue and subsys_initcall seems like a better fit for this particular case. We also delete the MODULE_LICENSE tag since that information is now contained at the top of the file in the comments. Cc: Kostenzer Felix Cc: Andrew Morton Signed-off-by: Paul Gortmaker --- [since this recently appeared in next via the akpm feed, I'm fine with this commit being squashed into the original. ] lib/sort.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/sort.c b/lib/sort.c index a9b156e7471b..0f2f3adce372 100644 --- a/lib/sort.c +++ b/lib/sort.c @@ -1,5 +1,6 @@ /* * A fast, small, non-recursive O(nlog n) sort for the Linux kernel + * License: GPL * * Jan 23 2005 Matt Mackall */ @@ -106,7 +107,7 @@ EXPORT_SYMBOL(sort); #ifdef CONFIG_TEST_SORT #include -#include +#include /* a simple boot-time regression test */ #define TEST_LEN 1000 @@ -143,7 +144,5 @@ static int __init test_sort_init(void) kfree(a); return err; } - -module_init(test_sort_init); -MODULE_LICENSE("GPL"); +subsys_initcall(test_sort_init); #endif -- 2.11.0