[Xen-changelog] [linux-2.6.18-xen] xen/x86: simplify synch_test_bit()

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1205839441 0
# Node ID 2ffc78135e7fc722e5e0df7c1d0a3f627cc5c6f7
# Parent  f619448beab508c3f495a7a1dcd04b9382870c5b
xen/x86: simplify synch_test_bit()

There really is no need for a redundant implementation here, just keep
the alternative name for allowing consumers to use consistent naming.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 include/asm-i386/mach-xen/asm/synch_bitops.h |   21 +--------------------
 1 files changed, 1 insertion(+), 20 deletions(-)

diff -r f619448beab5 -r 2ffc78135e7f 
include/asm-i386/mach-xen/asm/synch_bitops.h
--- a/include/asm-i386/mach-xen/asm/synch_bitops.h      Tue Mar 18 11:22:54 
2008 +0000
+++ b/include/asm-i386/mach-xen/asm/synch_bitops.h      Tue Mar 18 11:24:01 
2008 +0000
@@ -119,26 +119,7 @@ static inline unsigned long __synch_cmpx
        return old;
 }
 
-static __always_inline int synch_const_test_bit(int nr,
-                                               const volatile void * addr)
-{
-    return ((1UL << (nr & 31)) & 
-            (((const volatile unsigned int *) addr)[nr >> 5])) != 0;
-}
-
-static __inline__ int synch_var_test_bit(int nr, volatile void * addr)
-{
-    int oldbit;
-    __asm__ __volatile__ (
-        "btl %2,%1\n\tsbbl %0,%0"
-        : "=r" (oldbit) : "m" (ADDR), "Ir" (nr) );
-    return oldbit;
-}
-
-#define synch_test_bit(nr,addr) \
-(__builtin_constant_p(nr) ? \
- synch_const_test_bit((nr),(addr)) : \
- synch_var_test_bit((nr),(addr)))
+#define synch_test_bit test_bit
 
 #define synch_cmpxchg_subword synch_cmpxchg
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog