Merge tag 'docs-5.6' of git://git.lwn.net/linux

[linux.git] / kernel / power / suspend_test.c

diff --git a/kernel/power/suspend_test.c b/kernel/power/suspend_test.c
index 60564b58de0777864e9696f38cf32354518d208c..e1ed58adb69e480b8537bf4a37b2d2e1f23be9b2 100644 (file)
--- 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 @@ static void __init test_wakealarm(struct rtc_device *rtc, suspend_state_t state)
                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);