summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2017-02-24 15:01:09 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-24 17:46:57 -0800
commit8893f519330bb073a49c5b4676fce4be6f1be15d (patch)
tree32cba09b7393b9db3c9c0379541995b008127284
parentc5adae9583ef6985875532904160c6bf9f07b453 (diff)
downloadlinux-8893f519330bb073a49c5b4676fce4be6f1be15d.tar.gz
linux-8893f519330bb073a49c5b4676fce4be6f1be15d.tar.xz
lib/test_sort.c: make it explicitly non-modular
The Kconfig currently controlling compilation of this code is: lib/Kconfig.debug:config TEST_SORT lib/Kconfig.debug: bool "Array-based sort test" ...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. Link: http://lkml.kernel.org/r/20170124225608.7319-1-paul.gortmaker@windriver.com Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: Kostenzer Felix <fkostenzer@live.at> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--lib/test_sort.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/test_sort.c b/lib/test_sort.c
index d389c1cc2f6c..4db3911db50a 100644
--- a/lib/test_sort.c
+++ b/lib/test_sort.c
@@ -1,8 +1,11 @@
#include <linux/sort.h>
#include <linux/slab.h>
-#include <linux/module.h>
+#include <linux/init.h>
-/* a simple boot-time regression test */
+/*
+ * A simple boot-time regression test
+ * License: GPL
+ */
#define TEST_LEN 1000
@@ -38,6 +41,4 @@ exit:
kfree(a);
return err;
}
-
-module_init(test_sort_init);
-MODULE_LICENSE("GPL");
+subsys_initcall(test_sort_init);