diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-15 15:39:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-15 15:39:25 -0700 |
| commit | b176e21d812a0674196996e2f53d481208c5d832 (patch) | |
| tree | 4ee0dfc785e04b0bc78f54f65ce18e28ab122fc2 | |
| parent | 9855e873285f1395b9a04613c56101f04a5ec9fb (diff) | |
| parent | d4641fa67d3dcc24d108cbfc4e47d0312ef49947 (diff) | |
Merge tag 'torture.2024.07.12a' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu
Pull torture-test updates from Paul McKenney:
"This adds MODULE_DESCRIPTION() to torture.c, locktorture.c, and
scftorture.c, and also adds 'static' to a global variable that is used
only in scftorture.c"
* tag 'torture.2024.07.12a' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu:
scftorture: Make torture_type static
scftorture: Add MODULE_DESCRIPTION()
locktorture: Add MODULE_DESCRIPTION()
torture: Add MODULE_DESCRIPTION()
| -rw-r--r-- | kernel/locking/locktorture.c | 1 | ||||
| -rw-r--r-- | kernel/scftorture.c | 3 | ||||
| -rw-r--r-- | kernel/torture.c | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c index 415d81e6ce70..de95ec07e477 100644 --- a/kernel/locking/locktorture.c +++ b/kernel/locking/locktorture.c @@ -30,6 +30,7 @@ #include <linux/torture.h> #include <linux/reboot.h> +MODULE_DESCRIPTION("torture test facility for locking"); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Paul E. McKenney <paulmck@linux.ibm.com>"); diff --git a/kernel/scftorture.c b/kernel/scftorture.c index 59032aaccd18..44e83a646264 100644 --- a/kernel/scftorture.c +++ b/kernel/scftorture.c @@ -43,6 +43,7 @@ #define SCFTORTOUT_ERRSTRING(s, x...) pr_alert(SCFTORT_FLAG "!!! " s "\n", ## x) +MODULE_DESCRIPTION("Torture tests on the smp_call_function() family of primitives"); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Paul E. McKenney <paulmck@kernel.org>"); @@ -67,7 +68,7 @@ torture_param(int, weight_many_wait, -1, "Testing weight for multi-CPU operation torture_param(int, weight_all, -1, "Testing weight for all-CPU no-wait operations."); torture_param(int, weight_all_wait, -1, "Testing weight for all-CPU operations."); -char *torture_type = ""; +static char *torture_type = ""; #ifdef MODULE # define SCFTORT_SHUTDOWN 0 diff --git a/kernel/torture.c b/kernel/torture.c index c72ab2d251f4..dede150aef01 100644 --- a/kernel/torture.c +++ b/kernel/torture.c @@ -40,6 +40,7 @@ #include <linux/sched/rt.h> #include "rcu/rcu.h" +MODULE_DESCRIPTION("Common functions for in-kernel torture tests"); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Paul E. McKenney <paulmck@linux.ibm.com>"); |