Skip to content

Commit b176e21

Browse files
committed
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()
2 parents 9855e87 + d4641fa commit b176e21

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

kernel/locking/locktorture.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <linux/torture.h>
3131
#include <linux/reboot.h>
3232

33+
MODULE_DESCRIPTION("torture test facility for locking");
3334
MODULE_LICENSE("GPL");
3435
MODULE_AUTHOR("Paul E. McKenney <[email protected]>");
3536

kernel/scftorture.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343

4444
#define SCFTORTOUT_ERRSTRING(s, x...) pr_alert(SCFTORT_FLAG "!!! " s "\n", ## x)
4545

46+
MODULE_DESCRIPTION("Torture tests on the smp_call_function() family of primitives");
4647
MODULE_LICENSE("GPL");
4748
MODULE_AUTHOR("Paul E. McKenney <[email protected]>");
4849

@@ -67,7 +68,7 @@ torture_param(int, weight_many_wait, -1, "Testing weight for multi-CPU operation
6768
torture_param(int, weight_all, -1, "Testing weight for all-CPU no-wait operations.");
6869
torture_param(int, weight_all_wait, -1, "Testing weight for all-CPU operations.");
6970

70-
char *torture_type = "";
71+
static char *torture_type = "";
7172

7273
#ifdef MODULE
7374
# define SCFTORT_SHUTDOWN 0

kernel/torture.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
#include <linux/sched/rt.h>
4141
#include "rcu/rcu.h"
4242

43+
MODULE_DESCRIPTION("Common functions for in-kernel torture tests");
4344
MODULE_LICENSE("GPL");
4445
MODULE_AUTHOR("Paul E. McKenney <[email protected]>");
4546

0 commit comments

Comments
 (0)