From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Dec 2019 20:20:25 +0000 (-0800)
Subject: Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.5-rc1~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=043cf46825c102683b1027762c09c7e2b749e5a3;p=thirdparty%2Fkernel%2Flinux.git

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

Pull timer updates from Ingo Molnar:
 "The main changes in the timer code in this cycle were:

   - Clockevent updates:

      - timer-of framework cleanups. (Geert Uytterhoeven)

      - Use timer-of for the renesas-ostm and the device name to prevent
        name collision in case of multiple timers. (Geert Uytterhoeven)

      - Check if there is an error after calling of_clk_get in asm9260
        (Chuhong Yuan)

   - ABI fix: Zero out high order bits of nanoseconds on compat
     syscalls. This got broken a year ago, with apparently no side
     effects so far.

     Since the kernel would use random data otherwise I don't think we'd
     have other options but to fix the bug, even if there was a side
     effect to applications (Dmitry Safonov)

   - Optimize ns_to_timespec64() on 32-bit systems: move away from
     div_s64_rem() which can be slow, to div_u64_rem() which is faster
     (Arnd Bergmann)

   - Annotate KCSAN-reported false positive data races in
     hrtimer_is_queued() users by moving timer->state handling over to
     the READ_ONCE()/WRITE_ONCE() APIs. This documents these accesses
     (Eric Dumazet)

   - Misc cleanups and small fixes"

[ I undid the "ABI fix" and updated the comments instead. The reason
  there were apparently no side effects is that the fix was a no-op.

  The updated comment is to say _why_ it was a no-op.    - Linus ]

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  time: Zero the upper 32-bits in __kernel_timespec on 32-bit
  time: Rename tsk->real_start_time to ->start_boottime
  hrtimer: Remove the comment about not used HRTIMER_SOFTIRQ
  time: Fix spelling mistake in comment
  time: Optimize ns_to_timespec64()
  hrtimer: Annotate lockless access to timer->state
  clocksource/drivers/asm9260: Add a check for of_clk_get
  clocksource/drivers/renesas-ostm: Use unique device name instead of ostm
  clocksource/drivers/renesas-ostm: Convert to timer_of
  clocksource/drivers/timer-of: Use unique device name instead of timer
  clocksource/drivers/timer-of: Convert last full_name to %pOF
---

043cf46825c102683b1027762c09c7e2b749e5a3
diff --cc kernel/time/time.c
index 58e312e7380f6,4d434dad6ebcd..704ccd9451b09
--- a/kernel/time/time.c
+++ b/kernel/time/time.c
@@@ -878,10 -883,11 +881,11 @@@ int get_timespec64(struct timespec64 *t
  
  	ts->tv_sec = kts.tv_sec;
  
--	/* Zero out the padding for 32 bit systems or in compat mode */
 -	if (IS_ENABLED(CONFIG_64BIT_TIME) && (!IS_ENABLED(CONFIG_64BIT) ||
 -					      in_compat_syscall()))
++	/* Zero out the padding in compat mode */
 +	if (in_compat_syscall())
  		kts.tv_nsec &= 0xFFFFFFFFUL;
  
++	/* In 32-bit mode, this drops the padding */
  	ts->tv_nsec = kts.tv_nsec;
  
  	return 0;