diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2016-04-19 16:03:18 -0400 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2016-06-14 19:02:15 -0400 |
commit | f8cbdee99b161cb08c3fb55200941028c5fe25c8 (patch) | |
tree | 4fd3e6309e1e46bd8f41f85ee3271b4d9fca88a8 /kernel/rcu | |
parent | af8c34ce6ae32addda3788d54a7e340cad22516b (diff) |
torture: Simplify code, eliminate RCU_PERF_TEST_RUNNABLE
This commit applies the infamous IS_ENABLED() macro to eliminate a #ifdef.
It also eliminates the RCU_PERF_TEST_RUNNABLE Kconfig option in favor
of the already-existing rcuperf.perf_runnable kernel boot parameter.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'kernel/rcu')
-rw-r--r-- | kernel/rcu/rcuperf.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/rcu/rcuperf.c b/kernel/rcu/rcuperf.c index 3cee0d8393ed..afd174e901c3 100644 --- a/kernel/rcu/rcuperf.c +++ b/kernel/rcu/rcuperf.c | |||
@@ -96,12 +96,7 @@ static int rcu_perf_writer_state; | |||
96 | #define MAX_MEAS 10000 | 96 | #define MAX_MEAS 10000 |
97 | #define MIN_MEAS 100 | 97 | #define MIN_MEAS 100 |
98 | 98 | ||
99 | #if defined(MODULE) || defined(CONFIG_RCU_PERF_TEST_RUNNABLE) | 99 | static int perf_runnable = IS_ENABLED(MODULE); |
100 | #define RCUPERF_RUNNABLE_INIT 1 | ||
101 | #else | ||
102 | #define RCUPERF_RUNNABLE_INIT 0 | ||
103 | #endif | ||
104 | static int perf_runnable = RCUPERF_RUNNABLE_INIT; | ||
105 | module_param(perf_runnable, int, 0444); | 100 | module_param(perf_runnable, int, 0444); |
106 | MODULE_PARM_DESC(perf_runnable, "Start rcuperf at boot"); | 101 | MODULE_PARM_DESC(perf_runnable, "Start rcuperf at boot"); |
107 | 102 | ||