diff options
author | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /include/linux/seqlock.h | |
parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'include/linux/seqlock.h')
-rw-r--r-- | include/linux/seqlock.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h index 52c9eb9b6df2..26e4925bc35b 100644 --- a/include/linux/seqlock.h +++ b/include/linux/seqlock.h | |||
@@ -61,10 +61,10 @@ static inline void write_seqlock(seqlock_t *sl) | |||
61 | { | 61 | { |
62 | spin_lock(&sl->lock); | 62 | spin_lock(&sl->lock); |
63 | ++sl->sequence; | 63 | ++sl->sequence; |
64 | smp_wmb(); | 64 | smp_wmb(); |
65 | } | 65 | } |
66 | 66 | ||
67 | static inline void write_sequnlock(seqlock_t *sl) | 67 | static inline void write_sequnlock(seqlock_t *sl) |
68 | { | 68 | { |
69 | smp_wmb(); | 69 | smp_wmb(); |
70 | sl->sequence++; | 70 | sl->sequence++; |
@@ -77,7 +77,7 @@ static inline int write_tryseqlock(seqlock_t *sl) | |||
77 | 77 | ||
78 | if (ret) { | 78 | if (ret) { |
79 | ++sl->sequence; | 79 | ++sl->sequence; |
80 | smp_wmb(); | 80 | smp_wmb(); |
81 | } | 81 | } |
82 | return ret; | 82 | return ret; |
83 | } | 83 | } |