summaryrefslogtreecommitdiffstats
path: root/include/linux/rcupdate.h
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@tv-sign.ru>2006-01-10 16:48:02 +0300
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 08:42:50 -0800
commit69a0b3157983925f14fe0bdc49622d5389538d8d (patch)
treed77b406001d01b0a200c9f713d8287a2ec42ae58 /include/linux/rcupdate.h
parentc0400dc507a4345357fc25f13e8ac929287688a8 (diff)
downloadlinux-69a0b3157983925f14fe0bdc49622d5389538d8d.tar.gz
linux-69a0b3157983925f14fe0bdc49622d5389538d8d.tar.bz2
linux-69a0b3157983925f14fe0bdc49622d5389538d8d.zip
[PATCH] rcu: join rcu_ctrlblk and rcu_state
This patch moves rcu_state into the rcu_ctrlblk. I think there are no reasons why we should have 2 different variables to control rcu state. Every user of rcu_state has also "rcu_ctrlblk *rcp" in the parameter list. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Acked-by: Paul E. McKenney <paulmck@us.ibm.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/rcupdate.h')
-rw-r--r--include/linux/rcupdate.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index a1d26cb28925..981f9aa43353 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -65,6 +65,10 @@ struct rcu_ctrlblk {
long cur; /* Current batch number. */
long completed; /* Number of the last completed batch */
int next_pending; /* Is the next batch already waiting? */
+
+ spinlock_t lock ____cacheline_internodealigned_in_smp;
+ cpumask_t cpumask; /* CPUs that need to switch in order */
+ /* for current batch to proceed. */
} ____cacheline_internodealigned_in_smp;
/* Is batch a before batch b ? */