2 files changed, 15 insertions, 15 deletions

diff --git a/arch/x86/include/asm/atomic_32.h b/arch/x86/include/asm/atomic_32.h
index aa045deb2e75..d7c8849b8c67 100644
--- a/arch/x86/include/asm/atomic_32.h
+++ b/arch/x86/include/asm/atomic_32.h
@@ -268,15 +268,6 @@ typedef struct {
 
 #define ATOMIC64_INIT(val)      { (val) }
 
-/**
- * atomic64_read - read atomic64 variable
- * @ptr: pointer of type atomic64_t
- *
- * Atomically reads the value of @v.
- * Doesn't imply a read memory barrier.
- */
-#define __atomic64_read(ptr)            ((ptr)->counter)
-
 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
 
 /**
diff --git a/arch/x86/lib/atomic64_32.c b/arch/x86/lib/atomic64_32.c
index 6722a092e407..a804f96e90e2 100644
--- a/arch/x86/lib/atomic64_32.c
+++ b/arch/x86/lib/atomic64_32.c
@@ -33,14 +33,23 @@ EXPORT_SYMBOL(atomic64_cmpxchg);
  * Atomically xchgs the value of @ptr to @new_val and returns
  * the old value.
  */
-
 u64 atomic64_xchg(atomic64_t *ptr, u64 new_val)
 {
-        u64 old_val;
+        /*
+         * Try first with a (possibly incorrect) assumption about
+         * what we have there. We'll do two loops most likely,
+         * but we'll get an ownership MESI transaction straight away
+         * instead of a read transaction followed by a
+         * flush-for-ownership transaction:
+         */
+        u64 old_val, real_val = 0;
 
         do {
-                old_val = __atomic64_read(ptr);
-        } while (atomic64_cmpxchg(ptr, old_val, new_val) != old_val);
+                old_val = real_val;
+
+                real_val = atomic64_cmpxchg(ptr, old_val, new_val);
+
+        } while (real_val != old_val);
 
         return old_val;
 }
@@ -91,13 +100,13 @@ EXPORT_SYMBOL(atomic64_read);
 noinline u64 atomic64_add_return(u64 delta, atomic64_t *ptr)
 {
         /*
-         * Try first with a (probably incorrect) assumption about
+         * Try first with a (possibly incorrect) assumption about
          * what we have there. We'll do two loops most likely,
          * but we'll get an ownership MESI transaction straight away
          * instead of a read transaction followed by a
          * flush-for-ownership transaction:
          */
-        u64 old_val, new_val, real_val = 1ULL << 32;
+        u64 old_val, new_val, real_val = 0;
 
         do {
                 old_val = real_val;