]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Oct 2018 18:14:36 +0000 (11:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Oct 2018 18:14:36 +0000 (11:14 -0700)
Pull timekeeping updates from Thomas Gleixner:
 "The timers and timekeeping departement provides:

   - Another large y2038 update with further preparations for providing
     the y2038 safe timespecs closer to the syscalls.

   - An overhaul of the SHCMT clocksource driver

   - SPDX license identifier updates

   - Small cleanups and fixes all over the place"

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits)
  tick/sched : Remove redundant cpu_online() check
  clocksource/drivers/dw_apb: Add reset control
  clocksource: Remove obsolete CLOCKSOURCE_OF_DECLARE
  clocksource/drivers: Unify the names to timer-* format
  clocksource/drivers/sh_cmt: Add R-Car gen3 support
  dt-bindings: timer: renesas: cmt: document R-Car gen3 support
  clocksource/drivers/sh_cmt: Properly line-wrap sh_cmt_of_table[] initializer
  clocksource/drivers/sh_cmt: Fix clocksource width for 32-bit machines
  clocksource/drivers/sh_cmt: Fixup for 64-bit machines
  clocksource/drivers/sh_tmu: Convert to SPDX identifiers
  clocksource/drivers/sh_mtu2: Convert to SPDX identifiers
  clocksource/drivers/sh_cmt: Convert to SPDX identifiers
  clocksource/drivers/renesas-ostm: Convert to SPDX identifiers
  clocksource: Convert to using %pOFn instead of device_node.name
  tick/broadcast: Remove redundant check
  RISC-V: Request newstat syscalls
  y2038: signal: Change rt_sigtimedwait to use __kernel_timespec
  y2038: socket: Change recvmmsg to use __kernel_timespec
  y2038: sched: Change sched_rr_get_interval to use __kernel_timespec
  y2038: utimes: Rework #ifdef guards for compat syscalls
  ...

13 files changed:
1  2 
MAINTAINERS
arch/arm64/include/asm/compat.h
arch/x86/include/asm/compat.h
fs/read_write.c
include/linux/clocksource.h
include/linux/compat.h
include/linux/timekeeping.h
ipc/mqueue.c
ipc/shm.c
kernel/sched/core.c
kernel/signal.c
kernel/time/posix-timers.c
net/socket.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
diff --cc fs/read_write.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc ipc/mqueue.c
Simple merge
diff --cc ipc/shm.c
Simple merge
Simple merge
diff --cc kernel/signal.c
index dbd2e4db24cf42d630c3ebc73574c31189b0a96d,0831d56a731a78730024c46bf92260bac821958c..17565240b1c620fb5b5ca4c2047412bd817cba1c
@@@ -3164,8 -3081,8 +3164,8 @@@ int copy_siginfo_from_user32(struct ker
   *  @info: if non-null, the signal's siginfo is returned here
   *  @ts: upper bound on process time suspension
   */
 -static int do_sigtimedwait(const sigset_t *which, siginfo_t *info,
 +static int do_sigtimedwait(const sigset_t *which, kernel_siginfo_t *info,
-                   const struct timespec *ts)
+                   const struct timespec64 *ts)
  {
        ktime_t *to = NULL, timeout = KTIME_MAX;
        struct task_struct *tsk = current;
@@@ -3227,8 -3145,8 +3228,8 @@@ SYSCALL_DEFINE4(rt_sigtimedwait, const 
                size_t, sigsetsize)
  {
        sigset_t these;
-       struct timespec ts;
+       struct timespec64 ts;
 -      siginfo_t info;
 +      kernel_siginfo_t info;
        int ret;
  
        /* XXX: Don't preclude handling different sized sigset_t's.  */
  #ifdef CONFIG_COMPAT
  COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait, compat_sigset_t __user *, uthese,
                struct compat_siginfo __user *, uinfo,
-               struct compat_timespec __user *, uts, compat_size_t, sigsetsize)
+               struct old_timespec32 __user *, uts, compat_size_t, sigsetsize)
  {
        sigset_t s;
-       struct timespec t;
+       struct timespec64 t;
 -      siginfo_t info;
 +      kernel_siginfo_t info;
        long ret;
  
        if (sigsetsize != sizeof(sigset_t))
Simple merge
diff --cc net/socket.c
Simple merge