From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: <linux-kernel@vger.kernel.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>,
Kostenzer Felix <fkostenzer@live.at>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH] lib: sort: make it explicitly non-modular
Date: Wed, 18 Jan 2017 11:20:09 -0500 [thread overview]
Message-ID: <20170118162009.24763-1-paul.gortmaker@windriver.com> (raw)
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 <fkostenzer@live.at>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[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 <mpm@selenic.com>
*/
@@ -106,7 +107,7 @@ EXPORT_SYMBOL(sort);
#ifdef CONFIG_TEST_SORT
#include <linux/slab.h>
-#include <linux/module.h>
+#include <linux/init.h>
/* 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
next reply other threads:[~2017-01-18 16:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-18 16:20 Paul Gortmaker [this message]
2017-01-18 18:03 ` [PATCH] lib: sort: make it explicitly non-modular Andy Shevchenko
2017-01-18 19:31 ` Paul Gortmaker
2017-01-18 20:31 ` Felix Kostenzer
2017-01-19 0:41 ` Paul Gortmaker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170118162009.24763-1-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=akpm@linux-foundation.org \
--cc=fkostenzer@live.at \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).