lib/vdso: Avoid duplication in __cvdso_clock_getres()

VDSO_HRES and VDSO_RAW clocks are handled the same way.

Avoid the code duplication.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Andy Lutomirski <luto@kernel.org>
Link: https://lore.kernel.org/r/fdf1a968a8f7edd61456f1689ac44082ebb19c15.1577111367.git.christophe.leroy@c-s.fr

diff --git a/lib/vdso/gettimeofday.c b/lib/vdso/gettimeofday.c
index 5a5ec899a21ac5e413ca6e30b2db2905e051aa92..fac9e86ef124d115ef8a3661e8790dcfda8aabf1 100644 (file)
--- a/lib/vdso/gettimeofday.c
+++ b/lib/vdso/gettimeofday.c
@@ -193,7 +193,7 @@ int __cvdso_clock_getres_common(clockid_t clock, struct __kernel_timespec *res)
         * clocks are handled in the VDSO directly.
         */
        msk = 1U << clock;
-       if (msk & VDSO_HRES) {
+       if (msk & (VDSO_HRES | VDSO_RAW)) {
                /*
                 * Preserves the behaviour of posix_get_hrtimer_res().
                 */
@@ -203,11 +203,6 @@ int __cvdso_clock_getres_common(clockid_t clock, struct __kernel_timespec *res)
                 * Preserves the behaviour of posix_get_coarse_res().
                 */
                ns = LOW_RES_NSEC;
-       } else if (msk & VDSO_RAW) {
-               /*
-                * Preserves the behaviour of posix_get_hrtimer_res().
-                */
-               ns = hrtimer_res;
        } else {
                return -1;
        }