diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-05-21 12:00:33 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-05-21 13:24:30 -0700 |
| commit | 7d990a059acf5eb46ae99c058fc9911cbdce131d (patch) | |
| tree | ac9531b3ff2b2670dabc84c248a1770c84109586 /kernel | |
| parent | e8980e2a6a7392ae5a1f882d1ba01e03ac83f899 (diff) | |
| parent | 89fdc2c4bb83fff36199cd883a27efb317f02037 (diff) | |
| download | olio-linux-3.10-mattis_dev.tar.xz olio-linux-3.10-mattis_dev.zip | |
Merge branch 'android-omap-minnow-3.10-lollipop-wear-release' of https://android.googlesource.com/kernel/omap into mattis_devmattis_dev
Change-Id: I46165dd7747b9b6289eb44cb96cbef2de46c10ba
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/alarmtimer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index 07f7c6f9330..acd35596981 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -264,6 +264,9 @@ static int alarmtimer_suspend(struct device *dev) if (ret < 0) goto out; now = rtc_tm_to_ktime(tm); + dev_dbg(dev, "RTC is %lld next alarm will be in %lld seconds at %lld\n", + div64_u64(now.tv64, 1000000000), div64_u64(min.tv64, 1000000000), + div64_u64(ktime_to_ns(ktime_add(now, min)), 1000000000)); now = ktime_add(now, min); /* Set alarm, if in the past reject suspend briefly to handle */ |