diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-01-23 16:00:56 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-01-23 16:00:56 +0100 |
| commit | 322e929d196c27fa1bd50b389b800e9c30419bde (patch) | |
| tree | b54c5ea2ca3e8566ec95044488e549b670607be9 /kernel/power/suspend_test.c | |
| parent | 18451f9f9e5810b8bd1245c5ae166f257e0e2b9d (diff) | |
| parent | c052bf82c6b00ca27aab0859addc4b3159dfd3a4 (diff) | |
Merge back new material related to system-wide PM for v5.6.
Diffstat (limited to 'kernel/power/suspend_test.c')
| -rw-r--r-- | kernel/power/suspend_test.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/power/suspend_test.c b/kernel/power/suspend_test.c index 60564b58de07..e1ed58adb69e 100644 --- a/kernel/power/suspend_test.c +++ b/kernel/power/suspend_test.c @@ -70,7 +70,7 @@ static void __init test_wakealarm(struct rtc_device *rtc, suspend_state_t state) static char info_test[] __initdata = KERN_INFO "PM: test RTC wakeup from '%s' suspend\n"; - unsigned long now; + time64_t now; struct rtc_wkalrm alm; int status; @@ -81,10 +81,10 @@ repeat: printk(err_readtime, dev_name(&rtc->dev), status); return; } - rtc_tm_to_time(&alm.time, &now); + now = rtc_tm_to_time64(&alm.time); memset(&alm, 0, sizeof alm); - rtc_time_to_tm(now + TEST_SUSPEND_SECONDS, &alm.time); + rtc_time64_to_tm(now + TEST_SUSPEND_SECONDS, &alm.time); alm.enabled = true; status = rtc_set_alarm(rtc, &alm); |