From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 1 Dec 2019 22:00:59 +0000 (-0800)
Subject: Merge tag 'y2038-cleanups-5.5' of git://git.kernel.org:/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.5-rc1~100
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ceb307474506f888e8f16dab183405ff01dffa08;p=users%2Fwilly%2Flinux.git

Merge tag 'y2038-cleanups-5.5' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground

Pull y2038 cleanups from Arnd Bergmann:
 "y2038 syscall implementation cleanups

  This is a series of cleanups for the y2038 work, mostly intended for
  namespace cleaning: the kernel defines the traditional time_t, timeval
  and timespec types that often lead to y2038-unsafe code. Even though
  the unsafe usage is mostly gone from the kernel, having the types and
  associated functions around means that we can still grow new users,
  and that we may be missing conversions to safe types that actually
  matter.

  There are still a number of driver specific patches needed to get the
  last users of these types removed, those have been submitted to the
  respective maintainers"

Link: https://lore.kernel.org/lkml/20191108210236.1296047-1-arnd@arndb.de/

* tag 'y2038-cleanups-5.5' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground: (26 commits)
  y2038: alarm: fix half-second cut-off
  y2038: ipc: fix x32 ABI breakage
  y2038: fix typo in powerpc vdso "LOPART"
  y2038: allow disabling time32 system calls
  y2038: itimer: change implementation to timespec64
  y2038: move itimer reset into itimer.c
  y2038: use compat_{get,set}_itimer on alpha
  y2038: itimer: compat handling to itimer.c
  y2038: time: avoid timespec usage in settimeofday()
  y2038: timerfd: Use timespec64 internally
  y2038: elfcore: Use __kernel_old_timeval for process times
  y2038: make ns_to_compat_timeval use __kernel_old_timeval
  y2038: socket: use __kernel_old_timespec instead of timespec
  y2038: socket: remove timespec reference in timestamping
  y2038: syscalls: change remaining timeval to __kernel_old_timeval
  y2038: rusage: use __kernel_old_timeval
  y2038: uapi: change __kernel_time_t to __kernel_old_time_t
  y2038: stat: avoid 'time_t' in 'struct stat'
  y2038: ipc: remove __kernel_time_t reference from headers
  y2038: vdso: powerpc: avoid timespec references
  ...
---

ceb307474506f888e8f16dab183405ff01dffa08
diff --cc include/uapi/linux/ppp_defs.h
index 0039fa39a358,9277a33d08a2..20286bd90ab5
--- a/include/uapi/linux/ppp_defs.h
+++ b/include/uapi/linux/ppp_defs.h
@@@ -142,24 -142,10 +142,24 @@@ struct ppp_comp_stats 
  /*
   * The following structure records the time in seconds since
   * the last NP packet was sent or received.
 + *
 + * Linux implements both 32-bit and 64-bit time_t versions
 + * for compatibility with user space that defines ppp_idle
 + * based on the libc time_t.
   */
  struct ppp_idle {
-     __kernel_time_t xmit_idle;	/* time since last NP packet sent */
-     __kernel_time_t recv_idle;	/* time since last NP packet received */
+     __kernel_old_time_t xmit_idle;	/* time since last NP packet sent */
+     __kernel_old_time_t recv_idle;	/* time since last NP packet received */
  };
  
 +struct ppp_idle32 {
 +    __s32 xmit_idle;		/* time since last NP packet sent */
 +    __s32 recv_idle;		/* time since last NP packet received */
 +};
 +
 +struct ppp_idle64 {
 +    __s64 xmit_idle;		/* time since last NP packet sent */
 +    __s64 recv_idle;		/* time since last NP packet received */
 +};
 +
  #endif /* _UAPI_PPP_DEFS_H_ */