Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13cc36d7 authored by Benjamin Gaignard's avatar Benjamin Gaignard Committed by Thomas Gleixner
Browse files

x86/rtc: Stop using deprecated functions 



rtc_time_to_tm() and rtc_tm_to_time() are deprecated because they
rely on 32bits variables and that will make rtc break in y2038/2016.

Use the proper y2038 safe functions.

Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@linaro.org>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Stephen Boyd <stephen.boyd@linaro.org>
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Link: https://lkml.kernel.org/r/1520620971-9567-5-git-send-email-john.stultz@linaro.org
parent 16d1cb0b

arch/x86/kernel/rtc.c

+3 −3
Original line number Diff line number Diff line
@@ -41,11 +41,11 @@ EXPORT_SYMBOL(rtc_lock); 
 */

int mach_set_rtc_mmss(const struct timespec *now)

{

	unsigned long nowtime = now->tv_sec;

	unsigned long long nowtime = now->tv_sec;

	struct rtc_time tm;

	int retval = 0;



	rtc_time_to_tm(nowtime, &tm);

	rtc_time64_to_tm(nowtime, &tm);

	if (!rtc_valid_tm(&tm)) {

		retval = mc146818_set_time(&tm);

		if (retval)
@@ -53,7 +53,7 @@ int mach_set_rtc_mmss(const struct timespec *now) 
			       __func__, retval);

	} else {

		printk(KERN_ERR

		       "%s: Invalid RTC value: write of %lx to RTC failed\n",

		       "%s: Invalid RTC value: write of %llx to RTC failed\n",

			__func__, nowtime);

		retval = -EINVAL;

	}