[GIT pull] timers/urgent for v5.18-rc6

[Thomas Gleixner]

Linus,

please pull the latest timers/urgent branch from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-2022-05-08

up to:  2c33d775ef4c: timekeeping: Mark NMI safe time accessors as notrace


A fix and an email address update:

  - Mark the NMI safe time accessors notrace to prevent tracer recursion
    when they are selected as trace clocks.

  - John Stultz has a new email address

Thanks,

	tglx

------------------>
John Stultz (1):
      MAINTAINERS: Update email address for John Stultz

Kurt Kanzenbach (1):
      timekeeping: Mark NMI safe time accessors as notrace


 MAINTAINERS               | 8 ++++----
 kernel/time/timekeeping.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 40fa1955ca3f..c2e1b7202449 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5914,7 +5914,7 @@ R:	Benjamin Gaignard <benjamin.gaignard@xxxxxxxxxxxxx>
 R:	Liam Mark <lmark@xxxxxxxxxxxxxx>
 R:	Laura Abbott <labbott@xxxxxxxxxx>
 R:	Brian Starkey <Brian.Starkey@xxxxxxx>
-R:	John Stultz <john.stultz@xxxxxxxxxx>
+R:	John Stultz <jstultz@xxxxxxxxxx>
 L:	linux-media@xxxxxxxxxxxxxxx
 L:	dri-devel@xxxxxxxxxxxxxxxxxxxxx
 L:	linaro-mm-sig@xxxxxxxxxxxxxxxx (moderated for non-subscribers)
@@ -6584,7 +6584,7 @@ F:	drivers/gpu/drm/gma500/
 DRM DRIVERS FOR HISILICON
 M:	Xinliang Liu <xinliang.liu@xxxxxxxxxx>
 M:	Tian Tao  <tiantao6@xxxxxxxxxxxxx>
-R:	John Stultz <john.stultz@xxxxxxxxxx>
+R:	John Stultz <jstultz@xxxxxxxxxx>
 R:	Xinwei Kong <kong.kongxinwei@xxxxxxxxxxxxx>
 R:	Chen Feng <puck.chen@xxxxxxxxxxxxx>
 L:	dri-devel@xxxxxxxxxxxxxxxxxxxxx
@@ -8845,7 +8845,7 @@ F:	Documentation/devicetree/bindings/net/hisilicon*.txt
 F:	drivers/net/ethernet/hisilicon/
 
 HIKEY960 ONBOARD USB GPIO HUB DRIVER
-M:	John Stultz <john.stultz@xxxxxxxxxx>
+M:	John Stultz <jstultz@xxxxxxxxxx>
 L:	linux-kernel@xxxxxxxxxxxxxxx
 S:	Maintained
 F:	drivers/misc/hisi_hikey_usb.c
@@ -19784,7 +19784,7 @@ F:	drivers/net/wireless/ti/
 F:	include/linux/wl12xx.h
 
 TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
-M:	John Stultz <john.stultz@xxxxxxxxxx>
+M:	John Stultz <jstultz@xxxxxxxxxx>
 M:	Thomas Gleixner <tglx@xxxxxxxxxxxxx>
 R:	Stephen Boyd <sboyd@xxxxxxxxxx>
 L:	linux-kernel@xxxxxxxxxxxxxxx
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index dcdcb85121e4..3b1398fbddaf 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -482,7 +482,7 @@ static __always_inline u64 __ktime_get_fast_ns(struct tk_fast *tkf)
  * of the following timestamps. Callers need to be aware of that and
  * deal with it.
  */
-u64 ktime_get_mono_fast_ns(void)
+u64 notrace ktime_get_mono_fast_ns(void)
 {
 	return __ktime_get_fast_ns(&tk_fast_mono);
 }
@@ -494,7 +494,7 @@ EXPORT_SYMBOL_GPL(ktime_get_mono_fast_ns);
  * Contrary to ktime_get_mono_fast_ns() this is always correct because the
  * conversion factor is not affected by NTP/PTP correction.
  */
-u64 ktime_get_raw_fast_ns(void)
+u64 notrace ktime_get_raw_fast_ns(void)
 {
 	return __ktime_get_fast_ns(&tk_fast_raw);
 }