Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3e83131 authored by Luca Barbieri's avatar Luca Barbieri Committed by H. Peter Anvin
Browse files

x86-32: Fix atomic64_inc_not_zero return value convention 



atomic64_inc_not_zero must return 1 if it perfomed the add and 0 otherwise.
It was doing the opposite thing.

Signed-off-by: default avatarLuca Barbieri <luca@luca-barbieri.com>
LKML-Reference: <1267469749-11878-6-git-send-email-luca@luca-barbieri.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 25a304f2

arch/x86/lib/atomic64_386_32.S

+1 −2
Original line number Diff line number Diff line
@@ -153,13 +153,12 @@ BEGIN inc_not_zero %esi 
	adcl $0, %edx

	movl %eax,  ($v)

	movl %edx, 4($v)

	xorl %eax, %eax

	movl $1, %eax

2:

RETURN

3:

	testl %edx, %edx

	jne 1b

	movl $1, %eax

	jmp 2b

END_

arch/x86/lib/atomic64_cx8_32.S

+1 −2
Original line number Diff line number Diff line
@@ -212,14 +212,13 @@ ENTRY(atomic64_inc_not_zero_cx8) 
	cmpxchg8b (%esi)

	jne 1b



	xorl %eax, %eax

	movl $1, %eax

3:

	RESTORE ebx

	ret

4:

	testl %edx, %edx

	jne 2b

	movl $1, %eax

	jmp 3b

	CFI_ENDPROC

ENDPROC(atomic64_inc_not_zero_cx8)