Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+6
-6
+4
-4
MAINTAINERS
+4
-4
MAINTAINERS
···
5917
5917
R: Liam Mark <lmark@codeaurora.org>
5918
5918
R: Laura Abbott <labbott@redhat.com>
5919
5919
R: Brian Starkey <Brian.Starkey@arm.com>
5920
-
R: John Stultz <john.stultz@linaro.org>
5920
+
R: John Stultz <jstultz@google.com>
5921
5921
L: linux-media@vger.kernel.org
5922
5922
L: dri-devel@lists.freedesktop.org
5923
5923
L: linaro-mm-sig@lists.linaro.org (moderated for non-subscribers)
···
6587
6587
DRM DRIVERS FOR HISILICON
6588
6588
M: Xinliang Liu <xinliang.liu@linaro.org>
6589
6589
M: Tian Tao <tiantao6@hisilicon.com>
6590
-
R: John Stultz <john.stultz@linaro.org>
6590
+
R: John Stultz <jstultz@google.com>
6591
6591
R: Xinwei Kong <kong.kongxinwei@hisilicon.com>
6592
6592
R: Chen Feng <puck.chen@hisilicon.com>
6593
6593
L: dri-devel@lists.freedesktop.org
···
8848
8848
F: drivers/net/ethernet/hisilicon/
8849
8849
8850
8850
HIKEY960 ONBOARD USB GPIO HUB DRIVER
8851
-
M: John Stultz <john.stultz@linaro.org>
8851
+
M: John Stultz <jstultz@google.com>
8852
8852
L: linux-kernel@vger.kernel.org
8853
8853
S: Maintained
8854
8854
F: drivers/misc/hisi_hikey_usb.c
···
19793
19793
F: include/linux/wl12xx.h
19794
19794
19795
19795
TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
19796
-
M: John Stultz <john.stultz@linaro.org>
19796
+
M: John Stultz <jstultz@google.com>
19797
19797
M: Thomas Gleixner <tglx@linutronix.de>
19798
19798
R: Stephen Boyd <sboyd@kernel.org>
19799
19799
L: linux-kernel@vger.kernel.org
+2
-2
kernel/time/timekeeping.c
+2
-2
kernel/time/timekeeping.c
···
482
482
* of the following timestamps. Callers need to be aware of that and
483
483
* deal with it.
484
484
*/
485
-
u64 ktime_get_mono_fast_ns(void)
485
+
u64 notrace ktime_get_mono_fast_ns(void)
486
486
{
487
487
return __ktime_get_fast_ns(&tk_fast_mono);
488
488
}
···
494
494
* Contrary to ktime_get_mono_fast_ns() this is always correct because the
495
495
* conversion factor is not affected by NTP/PTP correction.
496
496
*/
497
-
u64 ktime_get_raw_fast_ns(void)
497
+
u64 notrace ktime_get_raw_fast_ns(void)
498
498
{
499
499
return __ktime_get_fast_ns(&tk_fast_raw);
500
500
}