diff options
author | John Stultz <john.stultz@linaro.org> | 2012-04-20 12:31:44 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-20 14:53:37 -0700 |
commit | e2d8ccef0a8e8aedaf401edca6ad54663b0da24b (patch) | |
tree | d0b2fa630e7d638527448be8ad8fba0c110a2269 /drivers/staging/android/android_alarm.h | |
parent | staging: comedi vmk80xx: lock held on error path (diff) | |
download | linux-dev-e2d8ccef0a8e8aedaf401edca6ad54663b0da24b.tar.xz linux-dev-e2d8ccef0a8e8aedaf401edca6ad54663b0da24b.zip |
staging: android-alarm: Convert ALARM_ELAPSED_REALTIME to use CLOCK_BOOTTIME
The ALARM_ELAPSED_REALTIME clock domain in Android pointed
to the need for something similar in linux system-wide
(instead of limited to just the alarm interface).
Thus CLOCK_BOOTTIME was introduced into the upstream kernel
in 2.6.39.
This patch attempts to convert the android alarm timer to utilize
the kernel's CLOCK_BOOTTIME clockid for ALARM_ELAPSED_REALTIME,
instead of managing it itself.
CC: Colin Cross <ccross@android.com>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Android Kernel Team <kernel-team@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/android_alarm.h')
-rw-r--r-- | drivers/staging/android/android_alarm.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/staging/android/android_alarm.h b/drivers/staging/android/android_alarm.h index e586caef4ba8..a1121772bc2e 100644 --- a/drivers/staging/android/android_alarm.h +++ b/drivers/staging/android/android_alarm.h @@ -37,6 +37,7 @@ enum android_alarm_type { #include <linux/ktime.h> #include <linux/rbtree.h> +#include <linux/hrtimer.h> /* * The alarm interface is similar to the hrtimer interface but adds support @@ -71,7 +72,11 @@ void android_alarm_start_range(struct android_alarm *alarm, ktime_t start, ktime_t end); int android_alarm_try_to_cancel(struct android_alarm *alarm); int android_alarm_cancel(struct android_alarm *alarm); -ktime_t alarm_get_elapsed_realtime(void); + +static inline ktime_t alarm_get_elapsed_realtime(void) +{ + return ktime_get_boottime(); +} /* set rtc while preserving elapsed realtime */ int android_alarm_set_rtc(const struct timespec ts); |