From 93c89c8adb7d4e588e2e5ffa05cd591ff0dc11b2 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Fri, 23 Mar 2012 15:52:25 -0700 Subject: [PATCH] --- yaml --- r: 297387 b: refs/heads/master c: ad30dfa94c5cc23931c822922a50bd163ab293a5 h: refs/heads/master i: 297385: 3b43d87542601f61e80f3e0481b667fbb48c36eb 297383: 371d05dc7a1a3cd6dcd05220189a606f5030bb68 v: v3 --- [refs] | 2 +- trunk/kernel/time/alarmtimer.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4c06ad0c496f..643817844e4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b43ae8a619d17c4935c3320d2ef9e92bdeed05d +refs/heads/master: ad30dfa94c5cc23931c822922a50bd163ab293a5 diff --git a/trunk/kernel/time/alarmtimer.c b/trunk/kernel/time/alarmtimer.c index 8a46f5d64504..c16548807f1e 100644 --- a/trunk/kernel/time/alarmtimer.c +++ b/trunk/kernel/time/alarmtimer.c @@ -46,9 +46,10 @@ static struct alarm_base { static ktime_t freezer_delta; static DEFINE_SPINLOCK(freezer_delta_lock); +static struct rtc_timer rtctimer; + #ifdef CONFIG_RTC_CLASS /* rtc timer and device for setting alarm wakeups at suspend */ -static struct rtc_timer rtctimer; static struct rtc_device *rtcdev; static DEFINE_SPINLOCK(rtcdev_lock); @@ -783,6 +784,8 @@ static int __init alarmtimer_init(void) .nsleep = alarm_timer_nsleep, }; + rtc_timer_init(&rtctimer, NULL, NULL); + posix_timers_register_clock(CLOCK_REALTIME_ALARM, &alarm_clock); posix_timers_register_clock(CLOCK_BOOTTIME_ALARM, &alarm_clock);