Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

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

diff --git a/include/asm-i386/rwlock.h b/include/asm-i386/rwlock.h
index 3ac1ba98b1bca861e9c64d10eb6fd21b84f225a5..c3e5db32fa48aca7a1c3d6edaf233a3b432c5922 100644 (file)
--- a/include/asm-i386/rwlock.h
+++ b/include/asm-i386/rwlock.h
@@ -20,54 +20,6 @@
 #define RW_LOCK_BIAS            0x01000000
 #define RW_LOCK_BIAS_STR       "0x01000000"
 
-#define __build_read_lock_ptr(rw, helper)   \
-       asm volatile(LOCK_PREFIX " ; subl $1,(%0)\n\t" \
-                       "jns 1f\n" \
-                       "call " helper "\n\t" \
-                       "1:\n" \
-                       :"a" (rw) : "memory")
-
-#define __build_read_lock_const(rw, helper)   \
-       asm volatile(LOCK_PREFIX " ; 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)) \
-                                                       __build_read_lock_const(rw, helper); \
-                                               else \
-                                                       __build_read_lock_ptr(rw, helper); \
-                                       } while (0)
-
-#define __build_write_lock_ptr(rw, helper) \
-       asm volatile(LOCK_PREFIX " ; 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")
-
-#define __build_write_lock_const(rw, helper) \
-       asm volatile(LOCK_PREFIX " ; 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")
-
-#define __build_write_lock(rw, helper) do { \
-                                               if (__builtin_constant_p(rw)) \
-                                                       __build_write_lock_const(rw, helper); \
-                                               else \
-                                                       __build_write_lock_ptr(rw, helper); \
-                                       } while (0)
+/* Code is in asm-i386/spinlock.h */
 
 #endif