diff options
Diffstat (limited to 'lib/kunit')
| -rw-r--r-- | lib/kunit/device.c | 4 | ||||
| -rw-r--r-- | lib/kunit/executor.c | 6 | ||||
| -rw-r--r-- | lib/kunit/test.c | 3 | ||||
| -rw-r--r-- | lib/kunit/try-catch.c | 9 |
4 files changed, 8 insertions, 14 deletions
diff --git a/lib/kunit/device.c b/lib/kunit/device.c index 3a31fe9ed..abc603730 100644 --- a/lib/kunit/device.c +++ b/lib/kunit/device.c @@ -36,7 +36,7 @@ struct kunit_device { #define to_kunit_device(d) container_of_const(d, struct kunit_device, dev) -static struct bus_type kunit_bus_type = { +static const struct bus_type kunit_bus_type = { .name = "kunit", }; @@ -51,7 +51,7 @@ int kunit_bus_init(void) error = bus_register(&kunit_bus_type); if (error) - root_device_unregister(kunit_bus_device); + bus_unregister(&kunit_bus_type); return error; } diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c index 689fff2b2..70b9a43cd 100644 --- a/lib/kunit/executor.c +++ b/lib/kunit/executor.c @@ -33,13 +33,13 @@ static char *filter_glob_param; static char *filter_param; static char *filter_action_param; -module_param_named(filter_glob, filter_glob_param, charp, 0400); +module_param_named(filter_glob, filter_glob_param, charp, 0600); MODULE_PARM_DESC(filter_glob, "Filter which KUnit test suites/tests run at boot-time, e.g. list* or list*.*del_test"); -module_param_named(filter, filter_param, charp, 0400); +module_param_named(filter, filter_param, charp, 0600); MODULE_PARM_DESC(filter, "Filter which KUnit test suites/tests run at boot-time using attributes, e.g. speed>slow"); -module_param_named(filter_action, filter_action_param, charp, 0400); +module_param_named(filter_action, filter_action_param, charp, 0600); MODULE_PARM_DESC(filter_action, "Changes behavior of filtered tests using attributes, valid values are:\n" "<none>: do not run filtered tests as normal\n" diff --git a/lib/kunit/test.c b/lib/kunit/test.c index b8514dbb3..1d1475578 100644 --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@ -712,9 +712,6 @@ int __kunit_test_suites_init(struct kunit_suite * const * const suites, int num_ { unsigned int i; - if (num_suites == 0) - return 0; - if (!kunit_enabled() && num_suites > 0) { pr_info("kunit: disabled\n"); return 0; diff --git a/lib/kunit/try-catch.c b/lib/kunit/try-catch.c index d9d1df28c..f7825991d 100644 --- a/lib/kunit/try-catch.c +++ b/lib/kunit/try-catch.c @@ -11,7 +11,6 @@ #include <linux/completion.h> #include <linux/kernel.h> #include <linux/kthread.h> -#include <linux/sched/task.h> #include "try-catch-impl.h" @@ -66,14 +65,13 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context) try_catch->context = context; try_catch->try_completion = &try_completion; try_catch->try_result = 0; - task_struct = kthread_create(kunit_generic_run_threadfn_adapter, - try_catch, "kunit_try_catch_thread"); + task_struct = kthread_run(kunit_generic_run_threadfn_adapter, + try_catch, + "kunit_try_catch_thread"); if (IS_ERR(task_struct)) { try_catch->catch(try_catch->context); return; } - get_task_struct(task_struct); - wake_up_process(task_struct); time_remaining = wait_for_completion_timeout(&try_completion, kunit_test_timeout()); @@ -83,7 +81,6 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context) kthread_stop(task_struct); } - put_task_struct(task_struct); exit_code = try_catch->try_result; if (!exit_code) |