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

Commit 634473db authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files

[PATCH] powerpc: vdso 64bits gettimeofday bug 



A bug in the assembly code of the vdso can cause gettimeofday() to hang
or to return incorrect results. The wrong register was used to test for
pending updates of the calibration variables and to create a dependency
for subsequent loads. This fixes it.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 827c1a6c

arch/powerpc/kernel/vdso64/gettimeofday.S

+2 −2
Original line number Diff line number Diff line
@@ -225,9 +225,9 @@ V_FUNCTION_BEGIN(__do_get_xsec) 
  .cfi_startproc

	/* check for update count & load values */

1:	ld	r8,CFG_TB_UPDATE_COUNT(r3)

	andi.	r0,r4,1			/* pending update ? loop */

	andi.	r0,r8,1			/* pending update ? loop */

	bne-	1b

	xor	r0,r4,r4		/* create dependency */

	xor	r0,r8,r8		/* create dependency */

	add	r3,r3,r0



	/* Get TB & offset it */