summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-01 14:51:53 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-02-02 15:28:15 +0100
commite5e542eea9075dd008993c2ee80b2cc9f31fc494 (patch)
tree5e63edaec5a5e0ce34b479ccc70fa311610d2abc /drivers
parentposix-timers: Make clock_getres and clock_get mandatory (diff)
downloadlinux-e5e542eea9075dd008993c2ee80b2cc9f31fc494.tar.xz
linux-e5e542eea9075dd008993c2ee80b2cc9f31fc494.zip
posix-timers: Convert clock_getres() to clockid_to_kclock()
Use the new kclock decoding. Fixup the fallout in mmtimer.c Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: John Stultz <johnstul@us.ibm.com> Tested-by: Richard Cochran <richard.cochran@omicron.at> LKML-Reference: <20110201134418.709802797@linutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/mmtimer.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c
index 262d10453cb8..141ffaeb976c 100644
--- a/drivers/char/mmtimer.c
+++ b/drivers/char/mmtimer.c
@@ -53,6 +53,8 @@ MODULE_LICENSE("GPL");
#define RTC_BITS 55 /* 55 bits for this implementation */
+static struct k_clock sgi_clock;
+
extern unsigned long sn_rtc_cycles_per_second;
#define RTC_COUNTER_ADDR ((long *)LOCAL_MMR_ADDR(SH_RTC))
@@ -763,10 +765,18 @@ static int sgi_timer_set(struct k_itimer *timr, int flags,
return err;
}
+static int sgi_clock_getres(const clockid_t which_clock, struct timespec *tp)
+{
+ tp->tv_sec = 0;
+ tp->tv_nsec = sgi_clock.res;
+ return 0;
+}
+
static struct k_clock sgi_clock = {
.res = 0,
.clock_set = sgi_clock_set,
.clock_get = sgi_clock_get,
+ .clock_getres = sgi_clock_getres,
.timer_create = sgi_timer_create,
.timer_set = sgi_timer_set,
.timer_del = sgi_timer_del,