Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

powerpc/vdso32: fix CLOCK_MONOTONIC on PPC64

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>

authored by

Christophe Leroy and committed by
Michael Ellerman
dd9a994f fd427103

+1 -1
+1 -1
arch/powerpc/kernel/vdso32/gettimeofday.S
··· 98 98 * can be used, r7 contains NSEC_PER_SEC. 99 99 */ 100 100 101 - lwz r5,WTOM_CLOCK_SEC(r9) 101 + lwz r5,(WTOM_CLOCK_SEC+LOPART)(r9) 102 102 lwz r6,WTOM_CLOCK_NSEC(r9) 103 103 104 104 /* We now have our offset in r5,r6. We create a fake dependency