rcu: Rename dynticks_completed to completed_fqs
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@linux.vnet.ibm.com> Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12578890423298-git-send-email-> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Родитель
956539b759
Коммит
4bcfe05503
|
@ -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)
|
static void dyntick_record_completed(struct rcu_state *rsp, long comp)
|
||||||
{
|
{
|
||||||
rsp->dynticks_completed = comp;
|
rsp->completed_fqs = comp;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_SMP
|
#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)
|
static long dyntick_recall_completed(struct rcu_state *rsp)
|
||||||
{
|
{
|
||||||
return rsp->dynticks_completed;
|
return rsp->completed_fqs;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -264,6 +264,8 @@ struct rcu_state {
|
||||||
long orphan_qlen; /* Number of orphaned cbs. */
|
long orphan_qlen; /* Number of orphaned cbs. */
|
||||||
spinlock_t fqslock; /* Only one task forcing */
|
spinlock_t fqslock; /* Only one task forcing */
|
||||||
/* quiescent states. */
|
/* quiescent states. */
|
||||||
|
long completed_fqs; /* Value of completed @ snap. */
|
||||||
|
/* Protected by fqslock. */
|
||||||
unsigned long jiffies_force_qs; /* Time at which to invoke */
|
unsigned long jiffies_force_qs; /* Time at which to invoke */
|
||||||
/* force_quiescent_state(). */
|
/* force_quiescent_state(). */
|
||||||
unsigned long n_force_qs; /* Number of calls to */
|
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 */
|
unsigned long jiffies_stall; /* Time at which to check */
|
||||||
/* for CPU stalls. */
|
/* for CPU stalls. */
|
||||||
#endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */
|
#endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */
|
||||||
long dynticks_completed; /* Value of completed @ snap. */
|
|
||||||
/* Protected by fqslock. */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef RCU_TREE_NONCORE
|
#ifdef RCU_TREE_NONCORE
|
||||||
|
|
Загрузка…
Ссылка в новой задаче