diff options
author | Christoph Lameter <clameter@sgi.com> | 2008-02-14 15:05:41 -0500 |
---|---|---|
committer | Christoph Lameter <clameter@sgi.com> | 2008-02-14 15:05:41 -0500 |
commit | c5974932c1e8514d3478573bb52beebeb2c786dd (patch) | |
tree | a204156fbb0036fb76e89ceffa15a30e90bc3f75 /kernel/rcupdate.c | |
parent | 9e40ade04c45a46f6b3d647e0bdac1a32bfaa3a9 (diff) | |
parent | e760e716d47b48caf98da348368fd41b4a9b9e7e (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/rcupdate.c')
-rw-r--r-- | kernel/rcupdate.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c index 760dfc233a00..c09605f8d16c 100644 --- a/kernel/rcupdate.c +++ b/kernel/rcupdate.c | |||
@@ -56,7 +56,10 @@ static atomic_t rcu_barrier_cpu_count; | |||
56 | static DEFINE_MUTEX(rcu_barrier_mutex); | 56 | static DEFINE_MUTEX(rcu_barrier_mutex); |
57 | static struct completion rcu_barrier_completion; | 57 | static struct completion rcu_barrier_completion; |
58 | 58 | ||
59 | /* Because of FASTCALL declaration of complete, we use this wrapper */ | 59 | /* |
60 | * Awaken the corresponding synchronize_rcu() instance now that a | ||
61 | * grace period has elapsed. | ||
62 | */ | ||
60 | static void wakeme_after_rcu(struct rcu_head *head) | 63 | static void wakeme_after_rcu(struct rcu_head *head) |
61 | { | 64 | { |
62 | struct rcu_synchronize *rcu; | 65 | struct rcu_synchronize *rcu; |