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

Commit cef37ac1 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Michael Ellerman
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarJeremy Kerr <jk@ozlabs.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 11ed8c55

arch/powerpc/platforms/cell/spufs/file.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

arch/powerpc/platforms/cell/spufs/spufs.h

+1 −1
Original line number Diff line number Diff line
@@ -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;