p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rcu: Remove CONFIG_TASKS_RCU ifdef from rcuperf.c 

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>
This commit is contained in:
Paul E. McKenney 2017-05-25 08:23:06 -07:00
parent ac3748c604
commit f1dbc54b92
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kernel/rcu/rcuperf.c
View File

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