diff options
Diffstat (limited to 'arch/x86/lib')
| -rw-r--r-- | arch/x86/lib/rwlock.S | 12 | ||||
| -rw-r--r-- | arch/x86/lib/thunk_64.S | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S index fca17829caa8..1cad22139c88 100644 --- a/arch/x86/lib/rwlock.S +++ b/arch/x86/lib/rwlock.S @@ -15,12 +15,12 @@ ENTRY(__write_lock_failed) CFI_STARTPROC FRAME 0: LOCK_PREFIX - addl $RW_LOCK_BIAS, (%__lock_ptr) + WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr) 1: rep; nop - cmpl $RW_LOCK_BIAS, (%__lock_ptr) + cmpl $WRITE_LOCK_CMP, (%__lock_ptr) jne 1b LOCK_PREFIX - subl $RW_LOCK_BIAS, (%__lock_ptr) + WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr) jnz 0b ENDFRAME ret @@ -31,12 +31,12 @@ ENTRY(__read_lock_failed) CFI_STARTPROC FRAME 0: LOCK_PREFIX - incl (%__lock_ptr) + READ_LOCK_SIZE(inc) (%__lock_ptr) 1: rep; nop - cmpl $1, (%__lock_ptr) + READ_LOCK_SIZE(cmp) $1, (%__lock_ptr) js 1b LOCK_PREFIX - decl (%__lock_ptr) + READ_LOCK_SIZE(dec) (%__lock_ptr) js 0b ENDFRAME ret diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S index d5b088b3ab81..a63efd6bb6a5 100644 --- a/arch/x86/lib/thunk_64.S +++ b/arch/x86/lib/thunk_64.S @@ -8,7 +8,6 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> #include <asm/calling.h> -#include <asm/rwlock.h> /* rdi: arg1 ... normal C conventions. rax is saved/restored. */ .macro THUNK name, func, put_ret_addr_in_rdi=0 |