lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 13 Jan 2020 19:09:32 -0000 From: "tip-bot2 for Christophe Leroy" <tip-bot2@...utronix.de> To: linux-tip-commits@...r.kernel.org Cc: Christophe Leroy <christophe.leroy@....fr>, Thomas Gleixner <tglx@...utronix.de>, Andy Lutomirski <luto@...nel.org>, x86 <x86@...nel.org>, LKML <linux-kernel@...r.kernel.org> Subject: [tip: timers/core] lib/vdso: Avoid duplication in __cvdso_clock_getres() The following commit has been merged into the timers/core branch of tip: Commit-ID: 8da6282775d172b6179de1b180323add609cba43 Gitweb: https://git.kernel.org/tip/8da6282775d172b6179de1b180323add609cba43 Author: Christophe Leroy <christophe.leroy@....fr> AuthorDate: Mon, 23 Dec 2019 14:31:09 Committer: Thomas Gleixner <tglx@...utronix.de> CommitterDate: Fri, 10 Jan 2020 22:19:40 +01:00 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@....fr> Signed-off-by: Thomas Gleixner <tglx@...utronix.de> Reviewed-by: Andy Lutomirski <luto@...nel.org> Link: https://lore.kernel.org/r/fdf1a968a8f7edd61456f1689ac44082ebb19c15.1577111367.git.christophe.leroy@c-s.fr --- lib/vdso/gettimeofday.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/vdso/gettimeofday.c b/lib/vdso/gettimeofday.c index 5a5ec89..fac9e86 100644 --- 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; }
Powered by blists - more mailing lists