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

Commit 26293b31 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

y2038: s390: Remove unneeded ipc uapi header files 



The s390 msgbuf/sembuf/shmbuf header files are all identical to the
version from asm-generic.

This patch removes the files and replaces them with 'generic-y'
statements, to avoid having to modify each copy when we extend sysvipc
to deal with 64-bit time_t in 32-bit user space.

Note that unlike alpha and ia64, the ipcbuf.h header file is slightly
different here, so I'm leaving the private copy.

To deal with 32-bit compat tasks, we also have to adapt the definitions
of compat_{shm,sem,msg}id_ds to match the changes to the respective
asm-generic files.

Acked-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 6f22a7f4

arch/s390/include/asm/compat.h

+16 −16
Original line number Diff line number Diff line
@@ -232,10 +232,10 @@ struct compat_ipc64_perm { 


struct compat_semid64_ds {

	struct compat_ipc64_perm sem_perm;

	compat_time_t  sem_otime;

	compat_ulong_t __pad1;

	compat_time_t  sem_ctime;

	compat_ulong_t __pad2;

	compat_ulong_t sem_otime;

	compat_ulong_t sem_otime_high;

	compat_ulong_t sem_ctime;

	compat_ulong_t sem_ctime_high;

	compat_ulong_t sem_nsems;

	compat_ulong_t __unused1;

	compat_ulong_t __unused2;
@@ -243,12 +243,12 @@ struct compat_semid64_ds { 


struct compat_msqid64_ds {

	struct compat_ipc64_perm msg_perm;

	compat_time_t   msg_stime;

	compat_ulong_t __pad1;

	compat_time_t   msg_rtime;

	compat_ulong_t __pad2;

	compat_time_t   msg_ctime;

	compat_ulong_t __pad3;

	compat_ulong_t msg_stime;

	compat_ulong_t msg_stime_high;

	compat_ulong_t msg_rtime;

	compat_ulong_t msg_rtime_high;

	compat_ulong_t msg_ctime;

	compat_ulong_t msg_ctime_high;

	compat_ulong_t msg_cbytes;

	compat_ulong_t msg_qnum;

	compat_ulong_t msg_qbytes;
@@ -261,12 +261,12 @@ struct compat_msqid64_ds { 
struct compat_shmid64_ds {

	struct compat_ipc64_perm shm_perm;

	compat_size_t  shm_segsz;

	compat_time_t  shm_atime;

	compat_ulong_t __pad1;

	compat_time_t  shm_dtime;

	compat_ulong_t __pad2;

	compat_time_t  shm_ctime;

	compat_ulong_t __pad3;

	compat_ulong_t shm_atime;

	compat_ulong_t shm_atime_high;

	compat_ulong_t shm_dtime;

	compat_ulong_t shm_dtime_high;

	compat_ulong_t shm_ctime;

	compat_ulong_t shm_ctime_high;

	compat_pid_t   shm_cpid;

	compat_pid_t   shm_lpid;

	compat_ulong_t shm_nattch;

arch/s390/include/uapi/asm/Kbuild

+3 −0
Original line number Diff line number Diff line
@@ -9,9 +9,12 @@ generic-y += errno.h 
generic-y += fcntl.h

generic-y += ioctl.h

generic-y += mman.h

generic-y += msgbuf.h

generic-y += param.h

generic-y += poll.h

generic-y += resource.h

generic-y += sembuf.h

generic-y += shmbuf.h

generic-y += sockios.h

generic-y += swab.h

generic-y += termbits.h

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

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef _S390_MSGBUF_H

#define _S390_MSGBUF_H



/* 

 * The msqid64_ds structure for S/390 architecture.

 * Note extra padding because this structure is passed back and forth

 * between kernel and user space.

 *

 * Pad space is left for:

 * - 64-bit time_t to solve y2038 problem

 * - 2 miscellaneous 32-bit values

 */



struct msqid64_ds {

	struct ipc64_perm msg_perm;

	__kernel_time_t msg_stime;	/* last msgsnd time */

#ifndef __s390x__

	unsigned long	__unused1;

#endif /* ! __s390x__ */

	__kernel_time_t msg_rtime;	/* last msgrcv time */

#ifndef __s390x__

	unsigned long	__unused2;

#endif /* ! __s390x__ */

	__kernel_time_t msg_ctime;	/* last change time */

#ifndef __s390x__

	unsigned long	__unused3;

#endif /* ! __s390x__ */

	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 */

	__kernel_pid_t msg_lspid;	/* pid of last msgsnd */

	__kernel_pid_t msg_lrpid;	/* last receive pid */

	unsigned long  __unused4;

	unsigned long  __unused5;

};



#endif /* _S390_MSGBUF_H */

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

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef _S390_SEMBUF_H

#define _S390_SEMBUF_H



/* 

 * The semid64_ds structure for S/390 architecture.

 * Note extra padding because this structure is passed back and forth

 * between kernel and user space.

 *

 * Pad space is left for:

 * - 64-bit time_t to solve y2038 problem (for !__s390x__)

 * - 2 miscellaneous 32-bit values

 */



struct semid64_ds {

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

	__kernel_time_t	sem_otime;		/* last semop time */

#ifndef __s390x__

	unsigned long	__unused1;

#endif /* ! __s390x__ */

	__kernel_time_t	sem_ctime;		/* last change time */

#ifndef __s390x__

	unsigned long	__unused2;

#endif /* ! __s390x__ */

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

	unsigned long	__unused3;

	unsigned long	__unused4;

};



#endif /* _S390_SEMBUF_H */

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

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef _S390_SHMBUF_H

#define _S390_SHMBUF_H



/* 

 * The shmid64_ds structure for S/390 architecture.

 * Note extra padding because this structure is passed back and forth

 * between kernel and user space.

 *

 * Pad space is left for:

 * - 64-bit time_t to solve y2038 problem (for !__s390x__)

 * - 2 miscellaneous 32-bit values

 */



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 */

#ifndef __s390x__

	unsigned long		__unused1;

#endif /* ! __s390x__ */

	__kernel_time_t		shm_dtime;	/* last detach time */

#ifndef __s390x__

	unsigned long		__unused2;

#endif /* ! __s390x__ */

	__kernel_time_t		shm_ctime;	/* last change time */

#ifndef __s390x__

	unsigned long		__unused3;

#endif /* ! __s390x__ */

	__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 */

	unsigned long		__unused4;

	unsigned long		__unused5;

};



struct shminfo64 {

	unsigned long	shmmax;

	unsigned long	shmmin;

	unsigned long	shmmni;

	unsigned long	shmseg;

	unsigned long	shmall;

	unsigned long	__unused1;

	unsigned long	__unused2;

	unsigned long	__unused3;

	unsigned long	__unused4;

};



#endif /* _S390_SHMBUF_H */