diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-02-08 10:27:56 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-08 10:27:56 +1100 |
commit | 065a7241b6c1770792634a5560f7bcdefdd02bea (patch) | |
tree | c6198961e4cd2a6336e75e7129e3d79d8b0bb639 /lib | |
parent | 5d3462c805548cd035f8d473bab218f97f1aec03 (diff) |
lib: move sort self-test into a separate file
The lib/sort.c file gets included in the EFI stub for use outside of the
kernel address space, which now fails due to the addition of a
module_init() function:
00000000 R_ARM_ABS32 test_sort_init
drivers/firmware/efi/libstub/lib-sort.stub.o: absolute symbol references not allowed in the EFI stub
drivers/firmware/efi/libstub/Makefile:69: recipe for target 'drivers/firmware/efi/libstub/lib-sort.stub.o' failed
Other library tests live in a separate file, so doing the same here
is an easy way to avoid the problem.
Fixes: akpm-current ("lib: add CONFIG_TEST_SORT to enable self-test of sort()")
Link: http://lkml.kernel.org/r/20170112110657.3123790-1-arnd@arndb.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Kostenzer Felix <fkostenzer@live.at>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Makefile | 1 | ||||
-rw-r--r-- | lib/sort.c | 44 | ||||
-rw-r--r-- | lib/test_sort.c | 43 |
3 files changed, 44 insertions, 44 deletions
diff --git a/lib/Makefile b/lib/Makefile index 35621b9c6414..5e2b3fc04d00 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -49,6 +49,7 @@ obj-$(CONFIG_TEST_KASAN) += test_kasan.o obj-$(CONFIG_TEST_KSTRTOX) += test-kstrtox.o obj-$(CONFIG_TEST_LKM) += test_module.o obj-$(CONFIG_TEST_RHASHTABLE) += test_rhashtable.o +obj-$(CONFIG_TEST_SORT) += test_sort.o obj-$(CONFIG_TEST_USER_COPY) += test_user_copy.o obj-$(CONFIG_TEST_STATIC_KEYS) += test_static_keys.o obj-$(CONFIG_TEST_STATIC_KEYS) += test_static_key_base.o diff --git a/lib/sort.c b/lib/sort.c index a9b156e7471b..975c6ef6fec7 100644 --- a/lib/sort.c +++ b/lib/sort.c @@ -103,47 +103,3 @@ void sort(void *base, size_t num, size_t size, } EXPORT_SYMBOL(sort); - -#ifdef CONFIG_TEST_SORT -#include <linux/slab.h> -#include <linux/module.h> -/* a simple boot-time regression test */ - -#define TEST_LEN 1000 - -static int __init cmpint(const void *a, const void *b) -{ - return *(int *)a - *(int *)b; -} - -static int __init test_sort_init(void) -{ - int *a, i, r = 1, err = -ENOMEM; - - a = kmalloc_array(TEST_LEN, sizeof(*a), GFP_KERNEL); - if (!a) - return err; - - for (i = 0; i < TEST_LEN; i++) { - r = (r * 725861) % 6599; - a[i] = r; - } - - sort(a, TEST_LEN, sizeof(*a), cmpint, NULL); - - err = -EINVAL; - for (i = 0; i < TEST_LEN-1; i++) - if (a[i] > a[i+1]) { - pr_err("test has failed\n"); - goto exit; - } - err = 0; - pr_info("test passed\n"); -exit: - kfree(a); - return err; -} - -module_init(test_sort_init); -MODULE_LICENSE("GPL"); -#endif diff --git a/lib/test_sort.c b/lib/test_sort.c new file mode 100644 index 000000000000..d389c1cc2f6c --- /dev/null +++ b/lib/test_sort.c @@ -0,0 +1,43 @@ +#include <linux/sort.h> +#include <linux/slab.h> +#include <linux/module.h> + +/* a simple boot-time regression test */ + +#define TEST_LEN 1000 + +static int __init cmpint(const void *a, const void *b) +{ + return *(int *)a - *(int *)b; +} + +static int __init test_sort_init(void) +{ + int *a, i, r = 1, err = -ENOMEM; + + a = kmalloc_array(TEST_LEN, sizeof(*a), GFP_KERNEL); + if (!a) + return err; + + for (i = 0; i < TEST_LEN; i++) { + r = (r * 725861) % 6599; + a[i] = r; + } + + sort(a, TEST_LEN, sizeof(*a), cmpint, NULL); + + err = -EINVAL; + for (i = 0; i < TEST_LEN-1; i++) + if (a[i] > a[i+1]) { + pr_err("test has failed\n"); + goto exit; + } + err = 0; + pr_info("test passed\n"); +exit: + kfree(a); + return err; +} + +module_init(test_sort_init); +MODULE_LICENSE("GPL"); |