Commit caf5e32d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

y2038: ipc: remove __kernel_time_t reference from headers 



There are two structures based on time_t that conflict between libc and
kernel: timeval and timespec. Both are now renamed to __kernel_old_timeval
and __kernel_old_timespec.

For time_t, the old typedef is still __kernel_time_t. There is nothing
wrong with that name, but it would be nice to not use that going forward
as this type is used almost only in deprecated interfaces because of
the y2038 overflow.

In the IPC headers (msgbuf.h, sembuf.h, shmbuf.h), __kernel_time_t is only
used for the 64-bit variants, which are not deprecated.

Change these to a plain 'long', which is the same type as __kernel_time_t
on all 64-bit architectures anyway, to reduce the number of users of the
old type.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 176ed98c

arch/mips/include/uapi/asm/msgbuf.h

+3 −3
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ 
#if defined(__mips64)

struct msqid64_ds {

	struct ipc64_perm msg_perm;

	__kernel_time_t msg_stime;	/* last msgsnd time */

	__kernel_time_t msg_rtime;	/* last msgrcv time */

	__kernel_time_t msg_ctime;	/* last change time */

	long msg_stime;			/* last msgsnd time */

	long msg_rtime;			/* last msgrcv time */

	long msg_ctime;			/* last change time */

	unsigned long  msg_cbytes;	/* current number of bytes on queue */

	unsigned long  msg_qnum;	/* number of messages in queue */

	unsigned long  msg_qbytes;	/* max number of bytes on queue */

arch/mips/include/uapi/asm/sembuf.h

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
#ifdef __mips64

struct semid64_ds {

	struct ipc64_perm sem_perm;		/* permissions .. see ipc.h */

	__kernel_time_t sem_otime;		/* last semop time */

	__kernel_time_t sem_ctime;		/* last change time */

	long		 sem_otime;		/* last semop time */

	long		 sem_ctime;		/* last change time */

	unsigned long	sem_nsems;		/* no. of semaphores in array */

	unsigned long	__unused1;

	unsigned long	__unused2;

arch/mips/include/uapi/asm/shmbuf.h

+3 −3
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ 
struct shmid64_ds {

	struct ipc64_perm	shm_perm;	/* operation perms */

	size_t			shm_segsz;	/* size of segment (bytes) */

	__kernel_time_t		shm_atime;	/* last attach time */

	__kernel_time_t		shm_dtime;	/* last detach time */

	__kernel_time_t		shm_ctime;	/* last change time */

	long			shm_atime;	/* last attach time */

	long			shm_dtime;	/* last detach time */

	long			shm_ctime;	/* last change time */

	__kernel_pid_t		shm_cpid;	/* pid of creator */

	__kernel_pid_t		shm_lpid;	/* pid of last operator */

	unsigned long		shm_nattch;	/* no. of current attaches */

arch/parisc/include/uapi/asm/msgbuf.h

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
struct msqid64_ds {

	struct ipc64_perm msg_perm;

#if __BITS_PER_LONG == 64

	__kernel_time_t msg_stime;	/* last msgsnd time */

	__kernel_time_t msg_rtime;	/* last msgrcv time */

	__kernel_time_t msg_ctime;	/* last change time */

	long		 msg_stime;	/* last msgsnd time */

	long		 msg_rtime;	/* last msgrcv time */

	long		 msg_ctime;	/* last change time */

#else

	unsigned long	msg_stime_high;

	unsigned long	msg_stime;	/* last msgsnd time */

arch/parisc/include/uapi/asm/sembuf.h

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
struct semid64_ds {

	struct ipc64_perm sem_perm;		/* permissions .. see ipc.h */

#if __BITS_PER_LONG == 64

	__kernel_time_t	sem_otime;		/* last semop time */

	__kernel_time_t	sem_ctime;		/* last change time */

	long		sem_otime;		/* last semop time */

	long		sem_ctime;		/* last change time */

#else

	unsigned long	sem_otime_high;

	unsigned long	sem_otime;		/* last semop time */

CRA Git | Maintained and supported by SUSTech CRA and CCSE