From: Keir Fraser <keir@xen.org>
Date: Fri, 29 Oct 2010 17:43:01 +0000 (+0100)
Subject: i386: simplify pte_read_atomic()
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~11303
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=61c7ab294f5f2ea5ac8b2dd3803ced99db9dd96a;p=xen.git

i386: simplify pte_read_atomic()

There's no need for a loop here: if the value to be compared against
and the value to be stored are equal, cmpxchg{,8b} act just like a
load anyway.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
---

diff --git a/xen/include/asm-x86/x86_32/page.h b/xen/include/asm-x86/x86_32/page.h
index 98c20ef27b..58419046b8 100644
--- a/xen/include/asm-x86/x86_32/page.h
+++ b/xen/include/asm-x86/x86_32/page.h
@@ -84,11 +84,7 @@ extern unsigned int PAGE_HYPERVISOR_NOCACHE;
 
 #endif
 
-#define pte_read_atomic(ptep) ({                              \
-    intpte_t __pte = *(ptep), __npte;                         \
-    while ( (__npte = cmpxchg(ptep, __pte, __pte)) != __pte ) \
-        __pte = __npte;                                       \
-    __pte; })
+#define pte_read_atomic(ptep) cmpxchg(ptep, 0, 0)
 #define pte_write_atomic(ptep, pte) do {                      \
     intpte_t __pte = *(ptep), __npte;                         \
     while ( (__npte = cmpxchg(ptep, __pte, (pte))) != __pte ) \