From d02a5b587d8612b0fe3ffee69212903c5873c011 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Fri, 20 Apr 2012 12:31:45 -0700 Subject: [PATCH] --- yaml --- r: 304398 b: refs/heads/master c: 57c498fa5df05e4bd410c101795368439fec7b4e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/alarmtimer.h | 3 +++ trunk/kernel/time/alarmtimer.c | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dacaf896bd39..1d2e64bdc40d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2d8ccef0a8e8aedaf401edca6ad54663b0da24b +refs/heads/master: 57c498fa5df05e4bd410c101795368439fec7b4e diff --git a/trunk/include/linux/alarmtimer.h b/trunk/include/linux/alarmtimer.h index 975009e1cbe6..96c5c249b086 100644 --- a/trunk/include/linux/alarmtimer.h +++ b/trunk/include/linux/alarmtimer.h @@ -76,4 +76,7 @@ static inline int alarmtimer_callback_running(struct alarm *timer) } +/* Provide way to access the rtc device being used by alarmtimers */ +struct rtc_device *alarmtimer_get_rtcdev(void); + #endif diff --git a/trunk/kernel/time/alarmtimer.c b/trunk/kernel/time/alarmtimer.c index 8a538c55fc7b..aa27d391bfc8 100644 --- a/trunk/kernel/time/alarmtimer.c +++ b/trunk/kernel/time/alarmtimer.c @@ -59,7 +59,7 @@ static DEFINE_SPINLOCK(rtcdev_lock); * If one has not already been chosen, it checks to see if a * functional rtc device is available. */ -static struct rtc_device *alarmtimer_get_rtcdev(void) +struct rtc_device *alarmtimer_get_rtcdev(void) { unsigned long flags; struct rtc_device *ret; @@ -115,7 +115,7 @@ static void alarmtimer_rtc_interface_remove(void) class_interface_unregister(&alarmtimer_rtc_interface); } #else -static inline struct rtc_device *alarmtimer_get_rtcdev(void) +struct rtc_device *alarmtimer_get_rtcdev(void) { return NULL; }