linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-i386 / rwlock.h

diff --git a/include/asm-i386/rwlock.h b/include/asm-i386/rwlock.h
index 94f0019..b57cc7a 100644 (file)
--- a/include/asm-i386/rwlock.h
+++ b/include/asm-i386/rwlock.h
@@ -21,23 +21,21 @@
 #define RW_LOCK_BIAS_STR       "0x01000000"
 
 #define __build_read_lock_ptr(rw, helper)   \
-       alternative_smp("lock; subl $1,(%0)\n\t" \
-                       "jns 1f\n" \
-                       "call " helper "\n\t" \
-                       "1:\n", \
-                       "subl $1,(%0)\n\t", \
-                       :"a" (rw) : "memory")
+       asm volatile(LOCK "subl $1,(%0)\n\t" \
+                    "jns 1f\n" \
+                    "call " helper "\n\t" \
+                    "1:\n" \
+                    ::"a" (rw) : "memory")
 
 #define __build_read_lock_const(rw, helper)   \
-       alternative_smp("lock; subl $1,%0\n\t" \
-                       "jns 1f\n" \
-                       "pushl %%eax\n\t" \
-                       "leal %0,%%eax\n\t" \
-                       "call " helper "\n\t" \
-                       "popl %%eax\n\t" \
-                       "1:\n", \
-                       "subl $1,%0\n\t", \
-                       "=m" (*(volatile int *)rw) : : "memory")
+       asm volatile(LOCK "subl $1,%0\n\t" \
+                    "jns 1f\n" \
+                    "pushl %%eax\n\t" \
+                    "leal %0,%%eax\n\t" \
+                    "call " helper "\n\t" \
+                    "popl %%eax\n\t" \
+                    "1:\n" \
+                    :"=m" (*(volatile int *)rw) : : "memory")
 
 #define __build_read_lock(rw, helper)  do { \
                                                if (__builtin_constant_p(rw)) \
@@ -47,23 +45,21 @@
                                        } while (0)
 
 #define __build_write_lock_ptr(rw, helper) \
-       alternative_smp("lock; subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \
-                       "jz 1f\n" \
-                       "call " helper "\n\t" \
-                       "1:\n", \
-                       "subl $" RW_LOCK_BIAS_STR ",(%0)\n\t", \
-                       :"a" (rw) : "memory")
+       asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \
+                    "jz 1f\n" \
+                    "call " helper "\n\t" \
+                    "1:\n" \
+                    ::"a" (rw) : "memory")
 
 #define __build_write_lock_const(rw, helper) \
-       alternative_smp("lock; subl $" RW_LOCK_BIAS_STR ",%0\n\t" \
-                       "jz 1f\n" \
-                       "pushl %%eax\n\t" \
-                       "leal %0,%%eax\n\t" \
-                       "call " helper "\n\t" \
-                       "popl %%eax\n\t" \
-                       "1:\n", \
-                       "subl $" RW_LOCK_BIAS_STR ",%0\n\t", \
-                       "=m" (*(volatile int *)rw) : : "memory")
+       asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",%0\n\t" \
+                    "jz 1f\n" \
+                    "pushl %%eax\n\t" \
+                    "leal %0,%%eax\n\t" \
+                    "call " helper "\n\t" \
+                    "popl %%eax\n\t" \
+                    "1:\n" \
+                    :"=m" (*(volatile int *)rw) : : "memory")
 
 #define __build_write_lock(rw, helper) do { \
                                                if (__builtin_constant_p(rw)) \