Patch "scsi: smartpqi: fix time handling" has been added to the 4.9-stable tree
This is a note to let you know that I've just added the patch titled
scsi: smartpqi: fix time handling
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
scsi-smartpqi-fix-time-handling.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
ed10858eadd4988260c6bc7d75fc25176342b5a7Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <[email protected]>
Date: Fri, 17 Feb 2017 16:03:52 +0100
Subject: scsi: smartpqi: fix time handling
From: Arnd Bergmann <[email protected]>
commit ed10858eadd4988260c6bc7d75fc25176342b5a7 upstream.
When we have turned off RTC support, the smartpqi driver fails to build:
ERROR: "rtc_time64_to_tm" [drivers/scsi/smartpqi/smartpqi.ko] undefined!
This is easily avoided by using the generic 'struct tm' based helper rather than the RTC specific one. While fixing this, I noticed that even though the driver uses time64_t for storing seconds, it gets them from the old 32-bit struct timeval. To address this, we can simplify the code by calling ktime_get_real_seconds() directly.
--- drivers/scsi/smartpqi/smartpqi_init.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/scsi/smartpqi/smartpqi_init.c +3 -5
@@ -533,8 +533,7 @@ static int pqi_write_current_time_to_hossize_t buffer_length;time64_t local_time;unsigned int year; -struct timeval time; -struct rtc_time tm; +struct tm tm; buffer_length =sizeof (*buffer);
@@ -551,9 +550,8 @@ static int pqi_write_current_time_to_hosput_unaligned_le16 (sizeof (buffer->time), &buffer->time_length); -do_gettimeofday (&time); - local_time = time.tv_sec - (sys_tz.tz_minuteswest *60 ); -rtc_time64_to_tm (local_time, &tm); + local_time =ktime_get_real_seconds (); +time64_to_tm (local_time, -sys_tz.tz_minuteswest *60 , &tm); year = tm.tm_year +1900 ; buffer->time[0 ] =bin2bcd (tm.tm_hour);
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/scsi-smartpqi-fix-time-handling.patch queue-4.9/leds-ktd2692-avoid-harmless-maybe-uninitialized-warning.patch