* tip-bot for John Stultz <john.stultz@xxxxxxxxxx> wrote:
> Commit-ID: ad30dfa94c5cc23931c822922a50bd163ab293a5
> Gitweb: http://git.kernel.org/tip/ad30dfa94c5cc23931c822922a50bd163ab293a5
> Author: John Stultz <john.stultz@xxxxxxxxxx>
> AuthorDate: Fri, 23 Mar 2012 15:52:25 -0700
> Committer: John Stultz <john.stultz@xxxxxxxxxx>
> CommitDate: Fri, 23 Mar 2012 16:23:12 -0700
>
> alarmtimer: Make sure we initialize the rtctimer
>
> jonghwan Choi reported seeing warnings with the alarmtimer
> code at suspend/resume time, and pointed out that the
> rtctimer isn't being properly initialized.
>
> This patch corrects this issue.
>
> Reported-by: jonghwan Choi <jhbird.choi@xxxxxxxxx>
> Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
> ---
> kernel/time/alarmtimer.c | 5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
> index 8a46f5d..c165488 100644
> --- a/kernel/time/alarmtimer.c
> +++ b/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);
This commit breaks every build that has CONFIG_RTC_LIB disabled:
alarmtimer.c:(.init.text+0x1cc7): undefined reference to `rtc_timer_init'
Thanks,
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|