summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-04-01 09:48:36 +0200
committerLennart Poettering <lennart@poettering.net>2016-04-01 09:48:36 +0200
commitbdf19f8fb2f4f2eff2c80bc629f7f6115c04c6e6 (patch)
tree20f0e6c0c17e156c5b2fea900596836952469f09
parent1db30aeab10ca716aae877b298289fe1765f14fb (diff)
Revert "time-util: fall back to CLOCK_MONOTONIC if CLOCK_BOOTTIME unsupported"
-rw-r--r--src/basic/time-util.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index c16460a198..7ca764abeb 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -47,15 +47,12 @@ static clockid_t map_clock_id(clockid_t c) {
/* Some more exotic archs (s390, ppc, …) lack the "ALARM" flavour of the clocks. Thus, clock_gettime() will
* fail for them. Since they are essentially the same as their non-ALARM pendants (their only difference is
* when timers are set on them), let's just map them accordingly. This way, we can get the correct time even on
- * those archs.
- *
- * Also, older kernels don't support CLOCK_BOOTTIME: fall back to CLOCK_MONOTONIC. */
+ * those archs. */
switch (c) {
- case CLOCK_BOOTTIME:
case CLOCK_BOOTTIME_ALARM:
- return clock_boottime_or_monotonic ();
+ return CLOCK_BOOTTIME;
case CLOCK_REALTIME_ALARM:
return CLOCK_REALTIME;