diff options
Diffstat (limited to 'kernel/rcutree.h')
| -rw-r--r-- | kernel/rcutree.h | 19 | 
1 files changed, 15 insertions, 4 deletions
diff --git a/kernel/rcutree.h b/kernel/rcutree.h index a240f032848..d274af35721 100644 --- a/kernel/rcutree.h +++ b/kernel/rcutree.h @@ -383,9 +383,8 @@ struct rcu_state {  	/* End of fields guarded by root rcu_node's lock. */ -	raw_spinlock_t onofflock ____cacheline_internodealigned_in_smp; -						/* exclude on/offline and */ -						/*  starting new GP. */ +	raw_spinlock_t orphan_lock ____cacheline_internodealigned_in_smp; +						/* Protect following fields. */  	struct rcu_head *orphan_nxtlist;	/* Orphaned callbacks that */  						/*  need a grace period. */  	struct rcu_head **orphan_nxttail;	/* Tail of above. */ @@ -394,7 +393,7 @@ struct rcu_state {  	struct rcu_head **orphan_donetail;	/* Tail of above. */  	long qlen_lazy;				/* Number of lazy callbacks. */  	long qlen;				/* Total number of callbacks. */ -	/* End of fields guarded by onofflock. */ +	/* End of fields guarded by orphan_lock. */  	struct mutex onoff_mutex;		/* Coordinate hotplug & GPs. */ @@ -405,6 +404,18 @@ struct rcu_state {  						/*  _rcu_barrier(). */  	/* End of fields guarded by barrier_mutex. */ +	atomic_long_t expedited_start;		/* Starting ticket. */ +	atomic_long_t expedited_done;		/* Done ticket. */ +	atomic_long_t expedited_wrap;		/* # near-wrap incidents. */ +	atomic_long_t expedited_tryfail;	/* # acquisition failures. */ +	atomic_long_t expedited_workdone1;	/* # done by others #1. */ +	atomic_long_t expedited_workdone2;	/* # done by others #2. */ +	atomic_long_t expedited_normal;		/* # fallbacks to normal. */ +	atomic_long_t expedited_stoppedcpus;	/* # successful stop_cpus. */ +	atomic_long_t expedited_done_tries;	/* # tries to update _done. */ +	atomic_long_t expedited_done_lost;	/* # times beaten to _done. */ +	atomic_long_t expedited_done_exit;	/* # times exited _done loop. */ +  	unsigned long jiffies_force_qs;		/* Time at which to invoke */  						/*  force_quiescent_state(). */  	unsigned long n_force_qs;		/* Number of calls to */  |