public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Len Brown <len.brown@intel.com>, Pavel Machek <pavel@ucw.cz>,
	linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] PM / sleep: switch to rtc_time64_to_tm/rtc_tm_to_time64
Date: Fri, 20 Dec 2019 10:18:27 +0100	[thread overview]
Message-ID: <1750207.ZPif39L95I@kreacher> (raw)
In-Reply-To: <20191210170540.3006422-1-alexandre.belloni@bootlin.com>

On Tuesday, December 10, 2019 6:05:40 PM CET Alexandre Belloni wrote:
> Call the 64bit versions of rtc_tm time conversion to avoid the y2038 issue.
> 
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> ---
>  kernel/power/suspend_test.c | 6 +++---
>  1 file 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 @@ 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);
> 

Applied (with a slightly modified changelog) as 5.6 material, thanks!





      reply	other threads:[~2019-12-20  9:18 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-10 17:05 [PATCH] PM / sleep: switch to rtc_time64_to_tm/rtc_tm_to_time64 Alexandre Belloni
2019-12-20  9:18 ` Rafael J. Wysocki [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1750207.ZPif39L95I@kreacher \
    --to=rjw@rjwysocki.net \
    --cc=alexandre.belloni@bootlin.com \
    --cc=len.brown@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=pavel@ucw.cz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox