* [tip: timers/core] lib/vdso: Avoid duplication in __cvdso_clock_getres()
@ 2020-01-14 13:02 tip-bot2 for Christophe Leroy
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Christophe Leroy @ 2020-01-14 13:02 UTC (permalink / raw)
To: linux-tip-commits
Cc: Christophe Leroy, Thomas Gleixner, Andy Lutomirski, x86, LKML
The following commit has been merged into the timers/core branch of tip:
Commit-ID: cdb7c5a9c897ab2e5c56df647dd84c84e150e925
Gitweb: https://git.kernel.org/tip/cdb7c5a9c897ab2e5c56df647dd84c84e150e925
Author: Christophe Leroy <christophe.leroy@c-s.fr>
AuthorDate: Mon, 23 Dec 2019 14:31:09
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 14 Jan 2020 12:20:47 +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@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
---
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;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: timers/core] lib/vdso: Avoid duplication in __cvdso_clock_getres()
@ 2020-01-13 19:09 tip-bot2 for Christophe Leroy
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Christophe Leroy @ 2020-01-13 19:09 UTC (permalink / raw)
To: linux-tip-commits
Cc: Christophe Leroy, Thomas Gleixner, Andy Lutomirski, x86, LKML
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@c-s.fr>
AuthorDate: Mon, 23 Dec 2019 14:31:09
Committer: Thomas Gleixner <tglx@linutronix.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@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
---
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;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-14 13:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-14 13:02 [tip: timers/core] lib/vdso: Avoid duplication in __cvdso_clock_getres() tip-bot2 for Christophe Leroy
-- strict thread matches above, loose matches on Subject: below --
2020-01-13 19:09 tip-bot2 for Christophe Leroy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.