diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2014-10-22 18:03:43 -0400 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2014-11-03 22:20:49 -0500 |
commit | 198bbf8127dd2dec6661622981a4e1f9b8f967b7 (patch) | |
tree | 29a9bb03ae2dab18abfe087a9893b151e0ea73cf /kernel/rcu/tree_plugin.h | |
parent | aa6da5140b784ece799f670bf532096f67aa7785 (diff) |
rcu: Remove "cpu" argument to rcu_prepare_for_idle()
The "cpu" argument to rcu_prepare_for_idle() is always the current
CPU, so drop it. This in turn allows two of the uses of "cpu" in
this function to be replaced with a this_cpu_ptr() and the third by
smp_processor_id(), replacing that of the call to rcu_prepare_for_idle().
Again, the anticipated cross-CPU uses of these functions has been replaced
by NO_HZ_FULL.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Pranith Kumar <bobby.prani@gmail.com>
Diffstat (limited to 'kernel/rcu/tree_plugin.h')
-rw-r--r-- | kernel/rcu/tree_plugin.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h index 1797b76cb3ff..5e68ab5fe317 100644 --- a/kernel/rcu/tree_plugin.h +++ b/kernel/rcu/tree_plugin.h | |||
@@ -1531,7 +1531,7 @@ static void rcu_cleanup_after_idle(int cpu) | |||
1531 | * Do the idle-entry grace-period work, which, because CONFIG_RCU_FAST_NO_HZ=n, | 1531 | * Do the idle-entry grace-period work, which, because CONFIG_RCU_FAST_NO_HZ=n, |
1532 | * is nothing. | 1532 | * is nothing. |
1533 | */ | 1533 | */ |
1534 | static void rcu_prepare_for_idle(int cpu) | 1534 | static void rcu_prepare_for_idle(void) |
1535 | { | 1535 | { |
1536 | } | 1536 | } |
1537 | 1537 | ||
@@ -1666,12 +1666,12 @@ int rcu_needs_cpu(unsigned long *dj) | |||
1666 | * | 1666 | * |
1667 | * The caller must have disabled interrupts. | 1667 | * The caller must have disabled interrupts. |
1668 | */ | 1668 | */ |
1669 | static void rcu_prepare_for_idle(int cpu) | 1669 | static void rcu_prepare_for_idle(void) |
1670 | { | 1670 | { |
1671 | #ifndef CONFIG_RCU_NOCB_CPU_ALL | 1671 | #ifndef CONFIG_RCU_NOCB_CPU_ALL |
1672 | bool needwake; | 1672 | bool needwake; |
1673 | struct rcu_data *rdp; | 1673 | struct rcu_data *rdp; |
1674 | struct rcu_dynticks *rdtp = &per_cpu(rcu_dynticks, cpu); | 1674 | struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks); |
1675 | struct rcu_node *rnp; | 1675 | struct rcu_node *rnp; |
1676 | struct rcu_state *rsp; | 1676 | struct rcu_state *rsp; |
1677 | int tne; | 1677 | int tne; |
@@ -1688,7 +1688,7 @@ static void rcu_prepare_for_idle(int cpu) | |||
1688 | return; | 1688 | return; |
1689 | 1689 | ||
1690 | /* If this is a no-CBs CPU, no callbacks, just return. */ | 1690 | /* If this is a no-CBs CPU, no callbacks, just return. */ |
1691 | if (rcu_is_nocb_cpu(cpu)) | 1691 | if (rcu_is_nocb_cpu(smp_processor_id())) |
1692 | return; | 1692 | return; |
1693 | 1693 | ||
1694 | /* | 1694 | /* |
@@ -1712,7 +1712,7 @@ static void rcu_prepare_for_idle(int cpu) | |||
1712 | return; | 1712 | return; |
1713 | rdtp->last_accelerate = jiffies; | 1713 | rdtp->last_accelerate = jiffies; |
1714 | for_each_rcu_flavor(rsp) { | 1714 | for_each_rcu_flavor(rsp) { |
1715 | rdp = per_cpu_ptr(rsp->rda, cpu); | 1715 | rdp = this_cpu_ptr(rsp->rda); |
1716 | if (!*rdp->nxttail[RCU_DONE_TAIL]) | 1716 | if (!*rdp->nxttail[RCU_DONE_TAIL]) |
1717 | continue; | 1717 | continue; |
1718 | rnp = rdp->mynode; | 1718 | rnp = rdp->mynode; |