diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2007-05-01 02:53:01 -0400 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2007-05-01 02:53:01 -0400 |
| commit | 48a7afe314bfc4d7f50e1608632f503dbba7e013 (patch) | |
| tree | 4a80e6b96321a71affd1bacea817de93be08894b /include/linux/seqlock.h | |
| parent | fb8f7ba077b5c665432082ab205bcd2cb01f6a3c (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
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 | } |