diff options
| author | Luca Barbieri <luca@luca-barbieri.com> | 2010-03-01 13:55:46 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-03-01 14:38:46 -0500 |
| commit | 6e6104fe085026e6ef82cc5cc303d6c8ceb7e411 (patch) | |
| tree | 0cd6c0a5574735f58563e4e96c68ec91a6c40033 | |
| parent | 9efbcd590243045111670c171a951923b877b57d (diff) | |
x86-32: Fix atomic64_add_unless return value convention
atomic64_add_unless must return 1 if it perfomed the add and 0 otherwise.
The implementation did the opposite thing.
Reported-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Luca Barbieri <luca@luca-barbieri.com>
LKML-Reference: <1267469749-11878-3-git-send-email-luca@luca-barbieri.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| -rw-r--r-- | arch/x86/lib/atomic64_386_32.S | 4 | ||||
| -rw-r--r-- | arch/x86/lib/atomic64_cx8_32.S | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S index 5db07fe4a0ca..a2f847c88b89 100644 --- a/arch/x86/lib/atomic64_386_32.S +++ b/arch/x86/lib/atomic64_386_32.S | |||
| @@ -133,13 +133,13 @@ BEGIN add_unless %ecx | |||
| 133 | 1: | 133 | 1: |
| 134 | movl %eax, ($v) | 134 | movl %eax, ($v) |
| 135 | movl %edx, 4($v) | 135 | movl %edx, 4($v) |
| 136 | xorl %eax, %eax | 136 | movl $1, %eax |
| 137 | 2: | 137 | 2: |
| 138 | RETURN | 138 | RETURN |
| 139 | 3: | 139 | 3: |
| 140 | cmpl %edx, %edi | 140 | cmpl %edx, %edi |
| 141 | jne 1b | 141 | jne 1b |
| 142 | movl $1, %eax | 142 | xorl %eax, %eax |
| 143 | jmp 2b | 143 | jmp 2b |
| 144 | END_ | 144 | END_ |
| 145 | 145 | ||
diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S index e49c4ebca9f4..d0e37b189f82 100644 --- a/arch/x86/lib/atomic64_cx8_32.S +++ b/arch/x86/lib/atomic64_cx8_32.S | |||
| @@ -180,7 +180,7 @@ ENTRY(atomic64_add_unless_cx8) | |||
| 180 | cmpxchg8b (%ebp) | 180 | cmpxchg8b (%ebp) |
| 181 | jne 1b | 181 | jne 1b |
| 182 | 182 | ||
| 183 | xorl %eax, %eax | 183 | movl $1, %eax |
| 184 | 3: | 184 | 3: |
| 185 | addl $8, %esp | 185 | addl $8, %esp |
| 186 | CFI_ADJUST_CFA_OFFSET -8 | 186 | CFI_ADJUST_CFA_OFFSET -8 |
| @@ -190,7 +190,7 @@ ENTRY(atomic64_add_unless_cx8) | |||
| 190 | 4: | 190 | 4: |
| 191 | cmpl %edx, 4(%esp) | 191 | cmpl %edx, 4(%esp) |
| 192 | jne 2b | 192 | jne 2b |
| 193 | movl $1, %eax | 193 | xorl %eax, %eax |
| 194 | jmp 3b | 194 | jmp 3b |
| 195 | CFI_ENDPROC | 195 | CFI_ENDPROC |
| 196 | ENDPROC(atomic64_add_unless_cx8) | 196 | ENDPROC(atomic64_add_unless_cx8) |
