diff options
| author | Christophe Leroy <christophe.leroy@c-s.fr> | 2019-04-04 12:20:05 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-02 09:58:52 +0200 |
| commit | 1e0cab1bce57cf1618eeb57d399b6f9dfe49fa5b (patch) | |
| tree | b0d1ab22336cddcb88c97078b8b8899e8a31ed74 /arch/powerpc | |
| parent | ae5e0c773ca699ff2ae91bce7bd25e92b402c0a1 (diff) | |
| download | linux-rpi3-1e0cab1bce57cf1618eeb57d399b6f9dfe49fa5b.tar.gz linux-rpi3-1e0cab1bce57cf1618eeb57d399b6f9dfe49fa5b.tar.bz2 linux-rpi3-1e0cab1bce57cf1618eeb57d399b6f9dfe49fa5b.zip | |
powerpc/vdso32: fix CLOCK_MONOTONIC on PPC64
[ Upstream commit dd9a994fc68d196a052b73747e3366c57d14a09e ]
Commit b5b4453e7912 ("powerpc/vdso64: Fix CLOCK_MONOTONIC
inconsistencies across Y2038") changed the type of wtom_clock_sec
to s64 on PPC64. Therefore, VDSO32 needs to read it with a 4 bytes
shift in order to retrieve the lower part of it.
Fixes: b5b4453e7912 ("powerpc/vdso64: Fix CLOCK_MONOTONIC inconsistencies across Y2038")
Reported-by: Christian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/vdso32/gettimeofday.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/vdso32/gettimeofday.S b/arch/powerpc/kernel/vdso32/gettimeofday.S index 769c2624e0a6..75cff3f336b3 100644 --- a/arch/powerpc/kernel/vdso32/gettimeofday.S +++ b/arch/powerpc/kernel/vdso32/gettimeofday.S @@ -98,7 +98,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) * can be used, r7 contains NSEC_PER_SEC. */ - lwz r5,WTOM_CLOCK_SEC(r9) + lwz r5,(WTOM_CLOCK_SEC+LOPART)(r9) lwz r6,WTOM_CLOCK_NSEC(r9) /* We now have our offset in r5,r6. We create a fake dependency |