|
@@ -1531,7 +1531,7 @@ static void rcu_cleanup_after_idle(int cpu)
|
|
* Do the idle-entry grace-period work, which, because CONFIG_RCU_FAST_NO_HZ=n,
|
|
* Do the idle-entry grace-period work, which, because CONFIG_RCU_FAST_NO_HZ=n,
|
|
* is nothing.
|
|
* is nothing.
|
|
*/
|
|
*/
|
|
-static void rcu_prepare_for_idle(int cpu)
|
|
|
|
|
|
+static void rcu_prepare_for_idle(void)
|
|
{
|
|
{
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1666,12 +1666,12 @@ int rcu_needs_cpu(unsigned long *dj)
|
|
*
|
|
*
|
|
* The caller must have disabled interrupts.
|
|
* The caller must have disabled interrupts.
|
|
*/
|
|
*/
|
|
-static void rcu_prepare_for_idle(int cpu)
|
|
|
|
|
|
+static void rcu_prepare_for_idle(void)
|
|
{
|
|
{
|
|
#ifndef CONFIG_RCU_NOCB_CPU_ALL
|
|
#ifndef CONFIG_RCU_NOCB_CPU_ALL
|
|
bool needwake;
|
|
bool needwake;
|
|
struct rcu_data *rdp;
|
|
struct rcu_data *rdp;
|
|
- struct rcu_dynticks *rdtp = &per_cpu(rcu_dynticks, cpu);
|
|
|
|
|
|
+ struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);
|
|
struct rcu_node *rnp;
|
|
struct rcu_node *rnp;
|
|
struct rcu_state *rsp;
|
|
struct rcu_state *rsp;
|
|
int tne;
|
|
int tne;
|
|
@@ -1688,7 +1688,7 @@ static void rcu_prepare_for_idle(int cpu)
|
|
return;
|
|
return;
|
|
|
|
|
|
/* If this is a no-CBs CPU, no callbacks, just return. */
|
|
/* If this is a no-CBs CPU, no callbacks, just return. */
|
|
- if (rcu_is_nocb_cpu(cpu))
|
|
|
|
|
|
+ if (rcu_is_nocb_cpu(smp_processor_id()))
|
|
return;
|
|
return;
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -1712,7 +1712,7 @@ static void rcu_prepare_for_idle(int cpu)
|
|
return;
|
|
return;
|
|
rdtp->last_accelerate = jiffies;
|
|
rdtp->last_accelerate = jiffies;
|
|
for_each_rcu_flavor(rsp) {
|
|
for_each_rcu_flavor(rsp) {
|
|
- rdp = per_cpu_ptr(rsp->rda, cpu);
|
|
|
|
|
|
+ rdp = this_cpu_ptr(rsp->rda);
|
|
if (!*rdp->nxttail[RCU_DONE_TAIL])
|
|
if (!*rdp->nxttail[RCU_DONE_TAIL])
|
|
continue;
|
|
continue;
|
|
rnp = rdp->mynode;
|
|
rnp = rdp->mynode;
|