diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-06-16 17:01:10 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-06-16 17:01:10 +0200 |
| commit | 1f2d9c9dd8276b1c19ef80e6d8059fe47506d4c3 (patch) | |
| tree | c5a3439c1c140eb87f7e3ece2e1148dece037b4f /include/linux/seqlock.h | |
| parent | a7fed7620b6eeaba98a558df46bb50a31828b462 (diff) | |
| parent | 520b2756d9414cb6b0f6fc70714e95ee9248ebf4 (diff) | |
Merge branch 'master' of /repos/git/net-next-2.6
Diffstat (limited to 'include/linux/seqlock.h')
| -rw-r--r-- | include/linux/seqlock.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h index e98cd2e57194..e9811892844f 100644 --- a/include/linux/seqlock.h +++ b/include/linux/seqlock.h @@ -41,9 +41,6 @@ typedef struct { #define __SEQLOCK_UNLOCKED(lockname) \ { 0, __SPIN_LOCK_UNLOCKED(lockname) } -#define SEQLOCK_UNLOCKED \ - __SEQLOCK_UNLOCKED(old_style_seqlock_init) - #define seqlock_init(x) \ do { \ (x)->sequence = 0; \ @@ -88,12 +85,12 @@ static __always_inline unsigned read_seqbegin(const seqlock_t *sl) unsigned ret; repeat: - ret = sl->sequence; - smp_rmb(); + ret = ACCESS_ONCE(sl->sequence); if (unlikely(ret & 1)) { cpu_relax(); goto repeat; } + smp_rmb(); return ret; } |