Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] i386: rwlock.h fix smp alternatives fix

Browse source 
Commit 8c74932779 ("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>
This commit is contained in:
Chris Wright 2006-08-31 00:53:22 -07:00 committed by Linus Torvalds
parent 4c15343167
commit 22db37ec5f
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
include/asm-i386/rwlock.h
View file

@ -21,21 +21,21 @@
#define RW_LOCK_BIAS_STR "0x01000000" #define RW_LOCK_BIAS_STR "0x01000000"
#define __build_read_lock_ptr(rw, helper) \ #define __build_read_lock_ptr(rw, helper) \
asm volatile(LOCK_PREFIX " ; subl $1,(%0)\n\t" \ asm volatile(LOCK_PREFIX " subl $1,(%0)\n\t" \
"jns 1f\n" \ "jns 1f\n" \
"call " helper "\n\t" \ "call " helper "\n\t" \
"1:\n" \ "1:\n" \
:"a" (rw) : "memory") ::"a" (rw) : "memory")
#define __build_read_lock_const(rw, helper) \ #define __build_read_lock_const(rw, helper) \
asm volatile(LOCK_PREFIX " ; subl $1,%0\n\t" \ asm volatile(LOCK_PREFIX " subl $1,%0\n\t" \
"jns 1f\n" \ "jns 1f\n" \
"pushl %%eax\n\t" \ "pushl %%eax\n\t" \
"leal %0,%%eax\n\t" \ "leal %0,%%eax\n\t" \
"call " helper "\n\t" \ "call " helper "\n\t" \
"popl %%eax\n\t" \ "popl %%eax\n\t" \
"1:\n" : \ "1:\n" \
"+m" (*(volatile int *)rw) : : "memory") :"+m" (*(volatile int *)rw) : : "memory")
#define __build_read_lock(rw, helper) do { \ #define __build_read_lock(rw, helper) do { \
if (__builtin_constant_p(rw)) \ if (__builtin_constant_p(rw)) \
@ -45,23 +45,21 @@
} while (0) } while (0)
#define __build_write_lock_ptr(rw, helper) \ #define __build_write_lock_ptr(rw, helper) \
asm volatile(LOCK_PREFIX " ; subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \ asm volatile(LOCK_PREFIX " subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \
"jz 1f\n" \ "jz 1f\n" \
"call " helper "\n\t" \ "call " helper "\n\t" \
"1:\n", \ "1:\n" \
"subl $" RW_LOCK_BIAS_STR ",(%0)\n\t", \ ::"a" (rw) : "memory")
:"a" (rw) : "memory")
#define __build_write_lock_const(rw, helper) \ #define __build_write_lock_const(rw, helper) \
asm volatile(LOCK_PREFIX " ; subl $" RW_LOCK_BIAS_STR ",%0\n\t" \ asm volatile(LOCK_PREFIX " subl $" RW_LOCK_BIAS_STR ",%0\n\t" \
"jz 1f\n" \ "jz 1f\n" \
"pushl %%eax\n\t" \ "pushl %%eax\n\t" \
"leal %0,%%eax\n\t" \ "leal %0,%%eax\n\t" \
"call " helper "\n\t" \ "call " helper "\n\t" \
"popl %%eax\n\t" \ "popl %%eax\n\t" \
"1:\n", \ "1:\n" \
"subl $" RW_LOCK_BIAS_STR ",%0\n\t", \ :"+m" (*(volatile int *)rw) : : "memory")
"+m" (*(volatile int *)rw) : : "memory")
#define __build_write_lock(rw, helper) do { \ #define __build_write_lock(rw, helper) do { \
if (__builtin_constant_p(rw)) \ if (__builtin_constant_p(rw)) \