forked from Minki/linux
x86: use immediates instead of RW_LOCK_BIAS_STR
Use immediate instead of the RW_LOCK_BIAS_STR. Makes the code more readable and gets rid of the string constant. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
a33fff3a03
commit
6514f93a2c
@ -2,7 +2,6 @@
|
||||
#define _ASM_X86_RWLOCK_H
|
||||
|
||||
#define RW_LOCK_BIAS 0x01000000
|
||||
#define RW_LOCK_BIAS_STR "0x01000000"
|
||||
|
||||
/* Actual code is in asm/spinlock.h or in arch/x86/lib/rwlock.S */
|
||||
|
||||
|
@ -156,11 +156,11 @@ static inline void __raw_read_lock(raw_rwlock_t *rw)
|
||||
|
||||
static inline void __raw_write_lock(raw_rwlock_t *rw)
|
||||
{
|
||||
asm volatile(LOCK_PREFIX " subl $" RW_LOCK_BIAS_STR ",(%0)\n\t"
|
||||
asm volatile(LOCK_PREFIX " subl %1,(%0)\n\t"
|
||||
"jz 1f\n"
|
||||
"call __write_lock_failed\n\t"
|
||||
"1:\n"
|
||||
::"a" (rw) : "memory");
|
||||
::"a" (rw), "i" (RW_LOCK_BIAS) : "memory");
|
||||
}
|
||||
|
||||
static inline int __raw_read_trylock(raw_rwlock_t *lock)
|
||||
@ -191,8 +191,8 @@ static inline void __raw_read_unlock(raw_rwlock_t *rw)
|
||||
|
||||
static inline void __raw_write_unlock(raw_rwlock_t *rw)
|
||||
{
|
||||
asm volatile(LOCK_PREFIX "addl $" RW_LOCK_BIAS_STR ", %0"
|
||||
: "+m" (rw->lock) : : "memory");
|
||||
asm volatile(LOCK_PREFIX "addl %1, %0"
|
||||
: "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
|
||||
}
|
||||
|
||||
#define _raw_spin_relax(lock) cpu_relax()
|
||||
|
@ -127,7 +127,7 @@ static inline void __raw_read_lock(raw_rwlock_t *rw)
|
||||
"jns 1f\n"
|
||||
"call __read_lock_failed\n\t"
|
||||
"1:\n"
|
||||
::"D" (rw), "i" (RW_LOCK_BIAS) : "memory");
|
||||
::"D" (rw) : "memory");
|
||||
}
|
||||
|
||||
static inline void __raw_write_lock(raw_rwlock_t *rw)
|
||||
@ -167,8 +167,8 @@ static inline void __raw_read_unlock(raw_rwlock_t *rw)
|
||||
|
||||
static inline void __raw_write_unlock(raw_rwlock_t *rw)
|
||||
{
|
||||
asm volatile(LOCK_PREFIX "addl $" RW_LOCK_BIAS_STR ", %0"
|
||||
: "+m" (rw->lock) : : "memory");
|
||||
asm volatile(LOCK_PREFIX "addl %1, %0"
|
||||
: "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
|
||||
}
|
||||
|
||||
#define _raw_spin_relax(lock) cpu_relax()
|
||||
|
Loading…
Reference in New Issue
Block a user