rcu: Remove CONFIG_TASKS_RCU ifdef from rcuperf.c
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Thu, 25 May 2017 15:23:06 +0000 (08:23 -0700)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Mon, 24 Jul 2017 23:04:09 +0000 (16:04 -0700)
The synchronize_rcu_tasks() and call_rcu_tasks() APIs are now available
regardless of kernel configuration, so this commit removes the
CONFIG_TASKS_RCU ifdef from rcuperf.c.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
kernel/rcu/rcuperf.c

index 3cc1811..1f87a02 100644 (file)
@@ -317,8 +317,6 @@ static struct rcu_perf_ops sched_ops = {
        .name           = "sched"
 };
 
-#ifdef CONFIG_TASKS_RCU
-
 /*
  * Definitions for RCU-tasks perf testing.
  */
@@ -346,24 +344,11 @@ static struct rcu_perf_ops tasks_ops = {
        .name           = "tasks"
 };
 
-#define RCUPERF_TASKS_OPS &tasks_ops,
-
 static bool __maybe_unused torturing_tasks(void)
 {
        return cur_ops == &tasks_ops;
 }
 
-#else /* #ifdef CONFIG_TASKS_RCU */
-
-#define RCUPERF_TASKS_OPS
-
-static bool __maybe_unused torturing_tasks(void)
-{
-       return false;
-}
-
-#endif /* #else #ifdef CONFIG_TASKS_RCU */
-
 /*
  * If performance tests complete, wait for shutdown to commence.
  */
@@ -658,7 +643,7 @@ rcu_perf_init(void)
        int firsterr = 0;
        static struct rcu_perf_ops *perf_ops[] = {
                &rcu_ops, &rcu_bh_ops, &srcu_ops, &srcud_ops, &sched_ops,
-               RCUPERF_TASKS_OPS
+               &tasks_ops,
        };
 
        if (!torture_init_begin(perf_type, verbose, &perf_runnable))