From: Shraddha Barke shraddha.6596@gmail.com

32-bit systems using 'struct timeval' will break in the year 2038, in order to avoid that replace the code with more appropriate types. This patch replaces the use of struct timeval and do_gettimeofday() with ktime_get_real_seconds() which returns a 64 bit seconds value. Real time is used since if monotonic time is used we would get duplicate timestamps after reboot as monotonic time starts from zero on every reboot.

Signed-off-by: Shraddha Barke shraddha.6596@gmail.com --- Changes in v2- Used real time and updated commit message.

drivers/block/sx8.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c index 59c91d4..1ec9fd2 100644 --- a/drivers/block/sx8.c +++ b/drivers/block/sx8.c @@ -23,7 +23,7 @@ #include <linux/workqueue.h> #include <linux/bitops.h> #include <linux/delay.h> -#include <linux/time.h> +#include <linux/ktime.h> #include <linux/hdreg.h> #include <linux/dma-mapping.h> #include <linux/completion.h> @@ -671,17 +671,17 @@ static int carm_send_special (struct carm_host *host, carm_sspc_t func) static unsigned int carm_fill_sync_time(struct carm_host *host, unsigned int idx, void *mem) { - struct timeval tv; struct carm_msg_sync_time *st = mem;

- do_gettimeofday(&tv); + time64_t kt = ktime_get_real_seconds();

memset(st, 0, sizeof(*st)); st->type = CARM_MSG_MISC; st->subtype = MISC_SET_TIME; st->handle = cpu_to_le32(TAG_ENCODE(idx)); - st->timestamp = cpu_to_le32(tv.tv_sec); + st->timestamp = cpu_to_le32(kt);

+ /* This driver will break in 2106 */ return sizeof(struct carm_msg_sync_time); }