Commit efd0581a authored by dann frazier's avatar dann frazier Committed by Tim Gardner

Revert "hrtimer: Add support for CLOCK_MONOTONIC_RAW"

BugLink: http://bugs.launchpad.net/bugs/1549494

This reverts commit 45b5c64b98b3ab90332bf7f256a6a1bae60c1527.
Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
parent 9b26cb36
......@@ -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,
};
......
......@@ -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,9 +1292,6 @@ 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);
while ((node = timerqueue_getnext(&base->active))) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment