linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-m68k / atomic.h

diff --git a/include/asm-m68k/atomic.h b/include/asm-m68k/atomic.h
index d5eed64..862e497 100644 (file)
--- a/include/asm-m68k/atomic.h
+++ b/include/asm-m68k/atomic.h
@@ -1,6 +1,7 @@
 #ifndef __ARCH_M68K_ATOMIC__
 #define __ARCH_M68K_ATOMIC__
 
+#include <linux/config.h>
 
 #include <asm/system.h>        /* local_irq_XXX() */
 
@@ -174,14 +175,8 @@ static inline void atomic_set_mask(unsigned long mask, unsigned long *v)
 ({                                                             \
        int c, old;                                             \
        c = atomic_read(v);                                     \
-       for (;;) {                                              \
-               if (unlikely(c == (u)))                         \
-                       break;                                  \
-               old = atomic_cmpxchg((v), c, c + (a));          \
-               if (likely(old == c))                           \
-                       break;                                  \
+       while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \
                c = old;                                        \
-       }                                                       \
        c != (u);                                               \
 })
 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)