Skip to content

Commit

Permalink
[PATCH] powerpc: vdso 64bits gettimeofday bug
Browse files Browse the repository at this point in the history
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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Benjamin Herrenschmidt authored and Paul Mackerras committed Feb 28, 2006
1 parent 827c1a6 commit 634473d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/powerpc/kernel/vdso64/gettimeofday.S
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 634473d

Please sign in to comment.