1 files changed, 3 insertions, 5 deletions

diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h
index e98cd2e57194..c6db9fb33c44 100644
--- a/include/linux/seqlock.h
+++ b/include/linux/seqlock.h
@@ -28,6 +28,7 @@
 
 #include <linux/spinlock.h>
 #include <linux/preempt.h>
+#include <asm/processor.h>
 
 typedef struct {
         unsigned sequence;
@@ -41,9 +42,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 +86,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;
 }