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

Pull timer fix from Thomas Gleixner:
 "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"

* tag 'timers-urgent-2022-05-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timekeeping: Mark NMI safe time accessors as notrace
  MAINTAINERS: Update email address for John Stultz

2 files changed, 6 insertions, 6 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 309dd16a079f..97fb18c7c26c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5917,7 +5917,7 @@ R:	Benjamin Gaignard <[email protected]>
 R:	Liam Mark <[email protected]>
 R:	Laura Abbott <[email protected]>
 R:	Brian Starkey <[email protected]>
-R:	John Stultz <[email protected]>
+R:	John Stultz <[email protected]>
 L:	[email protected]
 L:	[email protected]
 L:	[email protected] (moderated for non-subscribers)
@@ -6587,7 +6587,7 @@ F:	drivers/gpu/drm/gma500/
 DRM DRIVERS FOR HISILICON
 M:	Xinliang Liu <[email protected]>
 M:	Tian Tao  <[email protected]>
-R:	John Stultz <[email protected]>
+R:	John Stultz <[email protected]>
 R:	Xinwei Kong <[email protected]>
 R:	Chen Feng <[email protected]>
 L:	[email protected]
@@ -8848,7 +8848,7 @@ F:	Documentation/devicetree/bindings/net/hisilicon*.txt
 F:	drivers/net/ethernet/hisilicon/
 
 HIKEY960 ONBOARD USB GPIO HUB DRIVER
-M:	John Stultz <[email protected]>
+M:	John Stultz <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/misc/hisi_hikey_usb.c
@@ -19793,7 +19793,7 @@ F:	drivers/net/wireless/ti/
 F:	include/linux/wl12xx.h
 
 TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
-M:	John Stultz <[email protected]>
+M:	John Stultz <[email protected]>
 M:	Thomas Gleixner <[email protected]>
 R:	Stephen Boyd <[email protected]>
 L:	[email protected]
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);
 }