powerpc/spufs: use timespec64 for timestamps

The switch log prints the tv_sec portion of timespec as a 32-bit
number, while overflows in 2106. It also uses the timespec type,
which is safe on 64-bit architectures, but deprecated because
it causes overflows in 2038 elsewhere.

This changes it to timespec64 and printing a 64-bit number for
consistency.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 5ffcdeb..9413913 100644 (file)
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -2375,8 +2375,8 @@ static int switch_log_sprint(struct spu_context *ctx, char *tbuf, int n)
 
        p = ctx->switch_log->log + ctx->switch_log->tail % SWITCH_LOG_BUFSIZE;
 
-       return snprintf(tbuf, n, "%u.%09u %d %u %u %llu\n",
-                       (unsigned int) p->tstamp.tv_sec,
+       return snprintf(tbuf, n, "%llu.%09u %d %u %u %llu\n",
+                       (unsigned long long) p->tstamp.tv_sec,
                        (unsigned int) p->tstamp.tv_nsec,
                        p->spu_id,
                        (unsigned int) p->type,
@@ -2499,7 +2499,7 @@ void spu_switch_log_notify(struct spu *spu, struct spu_context *ctx,
                struct switch_log_entry *p;
 
                p = ctx->switch_log->log + ctx->switch_log->head;
-               ktime_get_ts(&p->tstamp);
+               ktime_get_ts64(&p->tstamp);
                p->timebase = get_tb();
                p->spu_id = spu ? spu->number : -1;
                p->type = type;

diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h
index 5e59f80..5d85c68 100644 (file)
--- a/arch/powerpc/platforms/cell/spufs/spufs.h
+++ b/arch/powerpc/platforms/cell/spufs/spufs.h
@@ -69,7 +69,7 @@ struct switch_log {
        unsigned long           head;
        unsigned long           tail;
        struct switch_log_entry {
-               struct timespec tstamp;
+               struct timespec64 tstamp;
                s32             spu_id;
                u32             type;
                u32             val;