diff options
-rw-r--r-- | include/linux/torture.h | 8 | ||||
-rw-r--r-- | kernel/rcu/rcutorture.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/linux/torture.h b/include/linux/torture.h index 5aae880b6b4e..09be8887fb08 100644 --- a/include/linux/torture.h +++ b/include/linux/torture.h | |||
@@ -41,6 +41,14 @@ | |||
41 | module_param(name, type, 0444); \ | 41 | module_param(name, type, 0444); \ |
42 | MODULE_PARM_DESC(name, msg); | 42 | MODULE_PARM_DESC(name, msg); |
43 | 43 | ||
44 | #define TORTURE_FLAG "-torture:" | ||
45 | #define TOROUT_STRING(s) \ | ||
46 | pr_alert("%s" TORTURE_FLAG s "\n", torture_type) | ||
47 | #define VERBOSE_TOROUT_STRING(s) \ | ||
48 | do { if (verbose) pr_alert("%s" TORTURE_FLAG s "\n", torture_type); } while (0) | ||
49 | #define VERBOSE_TOROUT_ERRSTRING(s) \ | ||
50 | do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! " s "\n", torture_type); } while (0) | ||
51 | |||
44 | /* Low-rider random number generator. */ | 52 | /* Low-rider random number generator. */ |
45 | struct torture_random_state { | 53 | struct torture_random_state { |
46 | unsigned long trs_state; | 54 | unsigned long trs_state; |
diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c index 34a75b1170e8..86fd8c11257b 100644 --- a/kernel/rcu/rcutorture.c +++ b/kernel/rcu/rcutorture.c | |||
@@ -97,14 +97,6 @@ static char *torture_type = "rcu"; | |||
97 | module_param(torture_type, charp, 0444); | 97 | module_param(torture_type, charp, 0444); |
98 | MODULE_PARM_DESC(torture_type, "Type of RCU to torture (rcu, rcu_bh, ...)"); | 98 | MODULE_PARM_DESC(torture_type, "Type of RCU to torture (rcu, rcu_bh, ...)"); |
99 | 99 | ||
100 | #define TORTURE_FLAG "-torture:" | ||
101 | #define TOROUT_STRING(s) \ | ||
102 | do { pr_alert("%s" TORTURE_FLAG s "\n", torture_type); } while (0) | ||
103 | #define VERBOSE_TOROUT_STRING(s) \ | ||
104 | do { if (verbose) pr_alert("%s" TORTURE_FLAG s "\n", torture_type); } while (0) | ||
105 | #define VERBOSE_TOROUT_ERRSTRING(s) \ | ||
106 | do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! " s "\n", torture_type); } while (0) | ||
107 | |||
108 | static int nrealreaders; | 100 | static int nrealreaders; |
109 | static struct task_struct *writer_task; | 101 | static struct task_struct *writer_task; |
110 | static struct task_struct **fakewriter_tasks; | 102 | static struct task_struct **fakewriter_tasks; |