Revert "arm64: vdso: Fix clock_getres() for CLOCK_REALTIME"

This reverts commit 9f641ee2b749d57b4672e4c28f4dba9523923ac4.

Signed-off-by: Khusika Dhamar Gusti <khusikadhamar@gmail.com>
Change-Id: Ib983c72f8d0868c4c2d50e31d0e5a48fb4f4354e

diff --git a/arch/arm64/include/asm/vdso_datapage.h b/arch/arm64/include/asm/vdso_datapage.h
index f89263c8e11affe95f628b848dd344a766860b9c..2b9a63771eda8c81b12ec4279a9e279543739ecc 100644 (file)
--- a/arch/arm64/include/asm/vdso_datapage.h
+++ b/arch/arm64/include/asm/vdso_datapage.h
@@ -38,7 +38,6 @@ struct vdso_data {
        __u32 tz_minuteswest;   /* Whacky timezone stuff */
        __u32 tz_dsttime;
        __u32 use_syscall;
-       __u32 hrtimer_res;
 };
 
 #endif /* !__ASSEMBLY__ */

diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
index b2debecb51e2e99640c51acd7aff4a2b8a5c3246..61ae19ef3c1a435589e15cc6e44843ef2b0979e9 100644 (file)
--- a/arch/arm64/kernel/asm-offsets.c
+++ b/arch/arm64/kernel/asm-offsets.c
@@ -94,7 +94,7 @@ int main(void)
   DEFINE(CLOCK_REALTIME,       CLOCK_REALTIME);
   DEFINE(CLOCK_MONOTONIC,      CLOCK_MONOTONIC);
   DEFINE(CLOCK_MONOTONIC_RAW,  CLOCK_MONOTONIC_RAW);
-  DEFINE(CLOCK_REALTIME_RES,   offsetof(struct vdso_data, hrtimer_res));
+  DEFINE(CLOCK_REALTIME_RES,   MONOTONIC_RES_NSEC);
   DEFINE(CLOCK_REALTIME_COARSE,        CLOCK_REALTIME_COARSE);
   DEFINE(CLOCK_MONOTONIC_COARSE,CLOCK_MONOTONIC_COARSE);
   DEFINE(CLOCK_COARSE_RES,     LOW_RES_NSEC);

diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c
index ef49ae3b0196d8f2aeb4328fe380d63f40c479fa..d24fe226c0500c677c374985ba2101bea2f131b1 100644 (file)
--- a/arch/arm64/kernel/vdso.c
+++ b/arch/arm64/kernel/vdso.c
@@ -215,9 +215,6 @@ void update_vsyscall(struct timekeeper *tk)
        vdso_data->wtm_clock_sec                = tk->wall_to_monotonic.tv_sec;
        vdso_data->wtm_clock_nsec               = tk->wall_to_monotonic.tv_nsec;
 
-       /* Read without the seqlock held by clock_getres() */
-       WRITE_ONCE(vdso_data->hrtimer_res, hrtimer_resolution);
-
        if (!use_syscall) {
                /* tkr_mono.cycle_last == tkr_raw.cycle_last */
                vdso_data->cs_cycle_last        = tk->tkr_mono.cycle_last;

diff --git a/arch/arm64/kernel/vdso/gettimeofday.S b/arch/arm64/kernel/vdso/gettimeofday.S
index 21805e416483126c7c519ed1aa4f831dc5c7dc21..c39872a7b03c3e152315781c753f3e6b186524ed 100644 (file)
--- a/arch/arm64/kernel/vdso/gettimeofday.S
+++ b/arch/arm64/kernel/vdso/gettimeofday.S
@@ -301,14 +301,13 @@ ENTRY(__kernel_clock_getres)
        ccmp    w0, #CLOCK_MONOTONIC_RAW, #0x4, ne
        b.ne    1f
 
-       adr     vdso_data, _vdso_data
-       ldr     w2, [vdso_data, #CLOCK_REALTIME_RES]
+       ldr     x2, 5f
        b       2f
 1:
        cmp     w0, #CLOCK_REALTIME_COARSE
        ccmp    w0, #CLOCK_MONOTONIC_COARSE, #0x4, ne
        b.ne    4f
-       ldr     x2, 5f
+       ldr     x2, 6f
 2:
        cbz     x1, 3f
        stp     xzr, x2, [x1]
@@ -322,6 +321,8 @@ ENTRY(__kernel_clock_getres)
        svc     #0
        ret
 5:
+       .quad   CLOCK_REALTIME_RES
+6:
        .quad   CLOCK_COARSE_RES
        .cfi_endproc
 ENDPROC(__kernel_clock_getres)