From 9a85a2a989e7f3c7b1dfffaa3afce36f2c042a35 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 3 Jul 2009 13:02:39 +0200
Subject: [PATCH] --- yaml --- r: 155214 b: refs/heads/master c:
 199e23780a7e75c63a9e3d1108804e3af450ea3e h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/lib/atomic64_32.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a83c078198ac..d019d3db0f89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3217120873598533234b6dedda9c371ce30001d0
+refs/heads/master: 199e23780a7e75c63a9e3d1108804e3af450ea3e
diff --git a/trunk/arch/x86/lib/atomic64_32.c b/trunk/arch/x86/lib/atomic64_32.c
index a910238a7760..fd28fd3fb742 100644
--- a/trunk/arch/x86/lib/atomic64_32.c
+++ b/trunk/arch/x86/lib/atomic64_32.c
@@ -36,7 +36,7 @@ u64 atomic64_xchg(atomic64_t *ptr, u64 new_val)
 	u64 old_val;
 
 	do {
-		old_val = atomic_read(ptr);
+		old_val = __atomic64_read(ptr);
 	} while (atomic64_cmpxchg(ptr, old_val, new_val) != old_val);
 
 	return old_val;