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

Commit 6f22a7f4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

y2038: ia64: Remove unneeded ipc uapi header files 



The ia64 ipcbuf/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 as part of the y2038 changes. While ia64 no longer has
a compat mode and doesn't need the file any more, it seem nicer
to clean this up anyway.

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

arch/ia64/include/uapi/asm/Kbuild

+4 −0
Original line number Diff line number Diff line
@@ -2,5 +2,9 @@ 
include include/uapi/asm-generic/Kbuild.asm



generic-y += bpf_perf_event.h

generic-y += ipcbuf.h

generic-y += kvm_para.h

generic-y += msgbuf.h

generic-y += poll.h

generic-y += sembuf.h

generic-y += shmbuf.h

arch/ia64/include/uapi/asm/ipcbuf.h

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

#include <asm-generic/ipcbuf.h>

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

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

#ifndef _ASM_IA64_MSGBUF_H

#define _ASM_IA64_MSGBUF_H



/*

 * The msqid64_ds structure for IA-64 architecture.

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

 * between kernel and user space.

 *

 * Pad space is left for:

 * - 2 miscellaneous 64-bit values

 */



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

	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  __unused1;

	unsigned long  __unused2;

};



#endif /* _ASM_IA64_MSGBUF_H */

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

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

#ifndef _ASM_IA64_SEMBUF_H

#define _ASM_IA64_SEMBUF_H



/*

 * The semid64_ds structure for IA-64 architecture.

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

 * between kernel and user space.

 *

 * Pad space is left for:

 * - 2 miscellaneous 64-bit values

 */



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

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

	unsigned long	__unused1;

	unsigned long	__unused2;

};



#endif /* _ASM_IA64_SEMBUF_H */

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

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

#ifndef _ASM_IA64_SHMBUF_H

#define _ASM_IA64_SHMBUF_H



/*

 * The shmid64_ds structure for IA-64 architecture.

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

 * between kernel and user space.

 *

 * Pad space is left for:

 * - 2 miscellaneous 64-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 */

	__kernel_time_t		shm_dtime;	/* last detach time */

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

	unsigned long		__unused1;

	unsigned long		__unused2;

};



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