Revert "hrtimer: Add support for CLOCK_MONOTONIC_RAW"

BugLink: http://bugs.launchpad.net/bugs/1549494
This reverts commit 45b5c64b98b3ab90332bf7f256a6a1bae60c1527.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 2f7bf185aeb21168f23ece47c7e39a2cf3fcbb64..2ead22dd74a00896d24fdb937242e8ba36a77cfe 100644 (file)
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -153,7 +153,6 @@ enum  hrtimer_base_type {
        HRTIMER_BASE_REALTIME,
        HRTIMER_BASE_BOOTTIME,
        HRTIMER_BASE_TAI,
-       HRTIMER_BASE_MONOTONIC_RAW,
        HRTIMER_MAX_CLOCK_BASES,
 };
 

diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 9eb2eef7a4ef1a92eb6d3d4bc4c4ff49180e477c..17f7bcff1e02bd6ff97c90943498557ea1a26c11 100644 (file)
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -90,11 +90,6 @@ DEFINE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases) =
                        .clockid = CLOCK_TAI,
                        .get_time = &ktime_get_clocktai,
                },
-               {
-                       .index = HRTIMER_BASE_MONOTONIC_RAW,
-                       .clockid = CLOCK_MONOTONIC_RAW,
-                       .get_time = &ktime_get_raw,
-               },
        }
 };
 
@@ -104,7 +99,6 @@ static const int hrtimer_clock_to_base_table[MAX_CLOCKS] = {
 
        [CLOCK_REALTIME]        = HRTIMER_BASE_REALTIME,
        [CLOCK_MONOTONIC]       = HRTIMER_BASE_MONOTONIC,
-       [CLOCK_MONOTONIC_RAW]   = HRTIMER_BASE_MONOTONIC_RAW,
        [CLOCK_BOOTTIME]        = HRTIMER_BASE_BOOTTIME,
        [CLOCK_TAI]             = HRTIMER_BASE_TAI,
 };
@@ -1298,10 +1292,7 @@ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now)
                if (!(active & 0x01))
                        continue;
 
-               if (unlikely(base->index == HRTIMER_BASE_MONOTONIC_RAW))
-                       basenow = ktime_get_raw();
-               else
-                       basenow = ktime_add(now, base->offset);
+               basenow = ktime_add(now, base->offset);
 
                while ((node = timerqueue_getnext(&base->active))) {
                        struct hrtimer *timer;