diff options
author | Chris Wright <chrisw@sous-sol.org> | 2006-08-31 03:53:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-31 13:46:07 -0400 |
commit | 22db37ec5fd51b0c77b1dd5751b1cdc2672c08d6 (patch) | |
tree | e77e6051471162d5201cce6e0e41712c5d175252 /include/asm-i386/rwlock.h | |
parent | 4c15343167b5febe7bb0ba96aad5bef42ae94d3b (diff) |
[PATCH] i386: rwlock.h fix smp alternatives fix
Commit 8c74932779fc6f61b4c30145863a17125c1a296c ("i386: Remove
alternative_smp") did not actually compile on x86 with CONFIG_SMP.
This fixes the __build_read/write_lock helpers. I've boot tested on
SMP.
[ Andi: "Oops, I think that was a quilt unrefreshed patch. Sorry. I
fixed those before testing, but then still send out the old patch." ]
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Cc: Gerd Hoffmann <kraxel@suse.de>
Acked-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-i386/rwlock.h')
-rw-r--r-- | include/asm-i386/rwlock.h | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/include/asm-i386/rwlock.h b/include/asm-i386/rwlock.h index 3ac1ba98b1bc..87c069ccba08 100644 --- a/include/asm-i386/rwlock.h +++ b/include/asm-i386/rwlock.h | |||
@@ -21,21 +21,21 @@ | |||
21 | #define RW_LOCK_BIAS_STR "0x01000000" | 21 | #define RW_LOCK_BIAS_STR "0x01000000" |
22 | 22 | ||
23 | #define __build_read_lock_ptr(rw, helper) \ | 23 | #define __build_read_lock_ptr(rw, helper) \ |
24 | asm volatile(LOCK_PREFIX " ; subl $1,(%0)\n\t" \ | 24 | asm volatile(LOCK_PREFIX " subl $1,(%0)\n\t" \ |
25 | "jns 1f\n" \ | 25 | "jns 1f\n" \ |
26 | "call " helper "\n\t" \ | 26 | "call " helper "\n\t" \ |
27 | "1:\n" \ | 27 | "1:\n" \ |
28 | :"a" (rw) : "memory") | 28 | ::"a" (rw) : "memory") |
29 | 29 | ||
30 | #define __build_read_lock_const(rw, helper) \ | 30 | #define __build_read_lock_const(rw, helper) \ |
31 | asm volatile(LOCK_PREFIX " ; subl $1,%0\n\t" \ | 31 | asm volatile(LOCK_PREFIX " subl $1,%0\n\t" \ |
32 | "jns 1f\n" \ | 32 | "jns 1f\n" \ |
33 | "pushl %%eax\n\t" \ | 33 | "pushl %%eax\n\t" \ |
34 | "leal %0,%%eax\n\t" \ | 34 | "leal %0,%%eax\n\t" \ |
35 | "call " helper "\n\t" \ | 35 | "call " helper "\n\t" \ |
36 | "popl %%eax\n\t" \ | 36 | "popl %%eax\n\t" \ |
37 | "1:\n" : \ | 37 | "1:\n" \ |
38 | "+m" (*(volatile int *)rw) : : "memory") | 38 | :"+m" (*(volatile int *)rw) : : "memory") |
39 | 39 | ||
40 | #define __build_read_lock(rw, helper) do { \ | 40 | #define __build_read_lock(rw, helper) do { \ |
41 | if (__builtin_constant_p(rw)) \ | 41 | if (__builtin_constant_p(rw)) \ |
@@ -45,23 +45,21 @@ | |||
45 | } while (0) | 45 | } while (0) |
46 | 46 | ||
47 | #define __build_write_lock_ptr(rw, helper) \ | 47 | #define __build_write_lock_ptr(rw, helper) \ |
48 | asm volatile(LOCK_PREFIX " ; subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \ | 48 | asm volatile(LOCK_PREFIX " subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \ |
49 | "jz 1f\n" \ | 49 | "jz 1f\n" \ |
50 | "call " helper "\n\t" \ | 50 | "call " helper "\n\t" \ |
51 | "1:\n", \ | 51 | "1:\n" \ |
52 | "subl $" RW_LOCK_BIAS_STR ",(%0)\n\t", \ | 52 | ::"a" (rw) : "memory") |
53 | :"a" (rw) : "memory") | ||
54 | 53 | ||
55 | #define __build_write_lock_const(rw, helper) \ | 54 | #define __build_write_lock_const(rw, helper) \ |
56 | asm volatile(LOCK_PREFIX " ; subl $" RW_LOCK_BIAS_STR ",%0\n\t" \ | 55 | asm volatile(LOCK_PREFIX " subl $" RW_LOCK_BIAS_STR ",%0\n\t" \ |
57 | "jz 1f\n" \ | 56 | "jz 1f\n" \ |
58 | "pushl %%eax\n\t" \ | 57 | "pushl %%eax\n\t" \ |
59 | "leal %0,%%eax\n\t" \ | 58 | "leal %0,%%eax\n\t" \ |
60 | "call " helper "\n\t" \ | 59 | "call " helper "\n\t" \ |
61 | "popl %%eax\n\t" \ | 60 | "popl %%eax\n\t" \ |
62 | "1:\n", \ | 61 | "1:\n" \ |
63 | "subl $" RW_LOCK_BIAS_STR ",%0\n\t", \ | 62 | :"+m" (*(volatile int *)rw) : : "memory") |
64 | "+m" (*(volatile int *)rw) : : "memory") | ||
65 | 63 | ||
66 | #define __build_write_lock(rw, helper) do { \ | 64 | #define __build_write_lock(rw, helper) do { \ |
67 | if (__builtin_constant_p(rw)) \ | 65 | if (__builtin_constant_p(rw)) \ |