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

Commit ba252f16 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-2038-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull time/Y2038 updates from Thomas Gleixner:

 - Consolidate SySV IPC UAPI headers

 - Convert SySV IPC to the new COMPAT_32BIT_TIME mechanism

 - Cleanup the core interfaces and standardize on the ktime_get_* naming
   convention.

 - Convert the X86 platform ops to timespec64

 - Remove the ugly temporary timespec64 hack

* 'timers-2038-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (22 commits)
  x86: Convert x86_platform_ops to timespec64
  timekeeping: Add more coarse clocktai/boottime interfaces
  timekeeping: Add ktime_get_coarse_with_offset
  timekeeping: Standardize on ktime_get_*() naming
  timekeeping: Clean up ktime_get_real_ts64
  timekeeping: Remove timespec64 hack
  y2038: ipc: Redirect ipc(SEMTIMEDOP, ...) to compat_ksys_semtimedop
  y2038: ipc: Enable COMPAT_32BIT_TIME
  y2038: ipc: Use __kernel_timespec
  y2038: ipc: Report long times to user space
  y2038: ipc: Use ktime_get_real_seconds consistently
  y2038: xtensa: Extend sysvipc data structures
  y2038: powerpc: Extend sysvipc data structures
  y2038: sparc: Extend sysvipc data structures
  y2038: parisc: Extend sysvipc data structures
  y2038: mips: Extend sysvipc data structures
  y2038: arm64: Extend sysvipc compat data structures
  y2038: s390: Remove unneeded ipc uapi header files
  y2038: ia64: Remove unneeded ipc uapi header files
  y2038: alpha: Remove unneeded ipc uapi header files
  ...
parents 0bbcce5d e27c4929

arch/alpha/include/uapi/asm/Kbuild

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



generic-y += bpf_perf_event.h

generic-y += ipcbuf.h

generic-y += msgbuf.h

generic-y += poll.h

generic-y += sembuf.h

generic-y += shmbuf.h

arch/alpha/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/alpha/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 _ALPHA_MSGBUF_H

#define _ALPHA_MSGBUF_H



/* 

 * The msqid64_ds structure for alpha 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 /* _ALPHA_MSGBUF_H */

arch/alpha/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 _ALPHA_SEMBUF_H

#define _ALPHA_SEMBUF_H



/* 

 * The semid64_ds structure for alpha 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 /* _ALPHA_SEMBUF_H */

arch/alpha/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 _ALPHA_SHMBUF_H

#define _ALPHA_SHMBUF_H



/* 

 * The shmid64_ds structure for alpha 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 /* _ALPHA_SHMBUF_H */