Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1423533

[PATCH tip/core/rcu 01/14] torture: Simplify code, eliminate RCU_PERF_TEST_RUNNABLE

Show all headers | View raw

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>
---
 kernel/rcu/rcuperf.c |  7 +------
 lib/Kconfig.debug    | 16 ----------------
 2 files changed, 1 insertion(+), 22 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;
 #define MAX_MEAS 10000
 #define MIN_MEAS 100
 
-#if defined(MODULE) || defined(CONFIG_RCU_PERF_TEST_RUNNABLE)
-#define RCUPERF_RUNNABLE_INIT 1
-#else
-#define RCUPERF_RUNNABLE_INIT 0
-#endif
-static int perf_runnable = RCUPERF_RUNNABLE_INIT;
+static int perf_runnable = IS_ENABLED(MODULE);
 module_param(perf_runnable, int, 0444);
 MODULE_PARM_DESC(perf_runnable, "Start rcuperf at boot");
 
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index b9cfdbfae9aa..cf6ddcd8f70c 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1307,22 +1307,6 @@ config RCU_PERF_TEST
 	  Say M if you want the RCU performance tests to build as a module.
 	  Say N if you are unsure.
 
-config RCU_PERF_TEST_RUNNABLE
-	bool "performance tests for RCU runnable by default"
-	depends on RCU_PERF_TEST = y
-	default n
-	help
-	  This option provides a way to build the RCU performance tests
-	  directly into the kernel without them starting up at boot time.
-	  You can use /sys/module to manually override this setting.
-	  This /proc file is available only when the RCU performance
-	  tests have been built into the kernel.
-
-	  Say Y here if you want the RCU performance tests to start during
-	  boot (you probably don't).
-	  Say N here if you want the RCU performance tests to start only
-	  after being manually enabled via /sys/module.
-
 config RCU_TORTURE_TEST
 	tristate "torture tests for RCU"
 	depends on DEBUG_KERNEL
-- 
2.5.2

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH tip/core/rcu 0/14] Torture-test changes for 4.8 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2016-06-16 00:10 +0200
  [PATCH tip/core/rcu 13/14] torture: Inflict default jitter "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2016-06-16 00:20 +0200
  [PATCH tip/core/rcu 06/14] torture: Stop onoff task if there is only one cpu "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2016-06-16 00:20 +0200
  [PATCH tip/core/rcu 04/14] torture:  Break online and offline functions out of torture_onoff() "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2016-06-16 00:20 +0200
  [PATCH tip/core/rcu 12/14] rcuperf: Don't treat gp_exp mis-setting as a WARN "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2016-06-16 00:20 +0200
  [PATCH tip/core/rcu 07/14] rcutorture/doc: Create initrd using dracut "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2016-06-16 00:20 +0200
  [PATCH tip/core/rcu 09/14] rcutorture: Make -soundhw a x86 specific option "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2016-06-16 00:20 +0200
  [PATCH tip/core/rcu 14/14] rcutorture: Fix error return code in rcu_perf_init() "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2016-06-16 00:20 +0200
  [PATCH tip/core/rcu 08/14] rcutorture: Use vmlinux as the fallback kernel image "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2016-06-16 00:20 +0200
  [PATCH tip/core/rcu 01/14] torture: Simplify code, eliminate RCU_PERF_TEST_RUNNABLE "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2016-06-16 00:20 +0200
  [PATCH tip/core/rcu 10/14] rcutorture: Don't specify the cpu type of QEMU on PPC "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2016-06-16 00:20 +0200
  [PATCH tip/core/rcu 11/14] rcutorture: Drop "-soundhw pcspkr" from x86 boot arguments "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2016-06-16 00:20 +0200
  [PATCH tip/core/rcu 05/14] torture: Add starvation events to error summary "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2016-06-16 00:20 +0200
  [PATCH tip/core/rcu 02/14] torture: Remove CONFIG_RCU_TORTURE_TEST_RUNNABLE, simplify code "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2016-06-16 00:20 +0200

csiph-web