[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <12578890423298-git-send-email->
Date: Tue, 10 Nov 2009 13:37:21 -0800
From: "Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>
To: linux-kernel@...r.kernel.org
Cc: mingo@...e.hu, laijs@...fujitsu.com, dipankar@...ibm.com,
akpm@...ux-foundation.org, mathieu.desnoyers@...ymtl.ca,
josh@...htriplett.org, dvhltc@...ibm.com, niv@...ibm.com,
tglx@...utronix.de, peterz@...radead.org, rostedt@...dmis.org,
Valdis.Kletnieks@...edu, dhowells@...hat.com,
"Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>
Subject: [PATCH tip/core/rcu 3/4] rcu: rename dynticks_completed to completed_fqs
From: Paul E. McKenney <paulmck@...ux.vnet.ibm.com>
This field is used whether or not CONFIG_NO_HZ is set, so the old name
of ->dynticks_completed is quite misleading. Change to ->completed_fqs,
given that it the value that force_quiescent_state() is trying to drive
the ->completed field away from.
Signed-off-by: Paul E. McKenney <paulmck@...ux.vnet.ibm.com>
---
kernel/rcutree.c | 4 ++--
kernel/rcutree.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/kernel/rcutree.c b/kernel/rcutree.c
index af9ea09..4026560 100644
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@ -187,7 +187,7 @@ static struct rcu_node *rcu_get_root(struct rcu_state *rsp)
*/
static void dyntick_record_completed(struct rcu_state *rsp, long comp)
{
- rsp->dynticks_completed = comp;
+ rsp->completed_fqs = comp;
}
#ifdef CONFIG_SMP
@@ -197,7 +197,7 @@ static void dyntick_record_completed(struct rcu_state *rsp, long comp)
*/
static long dyntick_recall_completed(struct rcu_state *rsp)
{
- return rsp->dynticks_completed;
+ return rsp->completed_fqs;
}
/*
diff --git a/kernel/rcutree.h b/kernel/rcutree.h
index e2f07a2..f478503 100644
--- a/kernel/rcutree.h
+++ b/kernel/rcutree.h
@@ -264,6 +264,8 @@ struct rcu_state {
long orphan_qlen; /* Number of orphaned cbs. */
spinlock_t fqslock; /* Only one task forcing */
/* quiescent states. */
+ long completed_fqs; /* Value of completed @ snap. */
+ /* Protected by fqslock. */
unsigned long jiffies_force_qs; /* Time at which to invoke */
/* force_quiescent_state(). */
unsigned long n_force_qs; /* Number of calls to */
@@ -278,8 +280,6 @@ struct rcu_state {
unsigned long jiffies_stall; /* Time at which to check */
/* for CPU stalls. */
#endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */
- long dynticks_completed; /* Value of completed @ snap. */
- /* Protected by fqslock. */
};
#ifdef RCU_TREE_NONCORE
--
1.5.2.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists