]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Revert "time-util: fall back to CLOCK_MONOTONIC if CLOCK_BOOTTIME unsupported" 2931/head
authorLennart Poettering <lennart@poettering.net>
Fri, 1 Apr 2016 07:48:36 +0000 (09:48 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 1 Apr 2016 07:48:36 +0000 (09:48 +0200)
src/basic/time-util.c

index c16460a198e5ceb13c6676212cb6dda98575c076..7ca764abeb0bda412a9c27b05c0fdbad98d4426a 100644 (file)
@@ -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;