diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-02-25 22:09:00 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-28 06:25:54 +0100 |
| commit | 634473db86502b6444c3cebd279a06e0b8737527 (patch) | |
| tree | 15b898352bc7fbfbc1a6cc9ef674eef89313dc59 | |
| parent | [PATCH] powerpc: fix dynamic PCI probe regression (diff) | |
| download | linux-634473db86502b6444c3cebd279a06e0b8737527.tar.xz linux-634473db86502b6444c3cebd279a06e0b8737527.zip | |
[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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/kernel/vdso64/gettimeofday.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/vdso64/gettimeofday.S b/arch/powerpc/kernel/vdso64/gettimeofday.S index ccaeda5136d1..4ee871f1cadb 100644 --- a/arch/powerpc/kernel/vdso64/gettimeofday.S +++ b/arch/powerpc/kernel/vdso64/gettimeofday.S @@ -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 */ |