From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 25 Oct 2018 18:14:36 +0000 (-0700)
Subject: Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.4-rc1~2377
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4dcb9239dad6cee17c538482619a5b659774ee51;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'timers-core-for-linus' of git://git./linux/kernel/git/tip/tip

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
  ...
---

4dcb9239dad6cee17c538482619a5b659774ee51
diff --cc kernel/signal.c
index dbd2e4d,0831d56..1756524
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@@ -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.  */
@@@ -3256,11 -3174,11 +3257,11 @@@
  #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))