x86/timers updates for v5.2
Subsystems (2)
Linus,
Please pull the latest x86-timers-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-timers-for-linus
# HEAD: 81423c37415fe45057d64196ae0ce8e17a9c7148 x86/timer: Don't inline __const_udelay()
Two changes: an LTO improvement, plus the new 'nowatchdog' boot option to disable the clocksource watchdog.
Thanks,
Ingo
------------------>
Andi Kleen (1):
x86/timer: Don't inline __const_udelay()
Juri Lelli (1):
x86/tsc: Add option to disable tsc clocksource watchdog
Documentation/admin-guide/kernel-parameters.txt | 4 ++++ arch/x86/kernel/tsc.c | 5 ++++- arch/x86/lib/delay.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +4 -0
@@ -4703,6 +4703,10 @@ [x86] unstable: mark the TSC clocksource as unstable, this marks the TSC unconditionally unstable at bootup and avoids any further wobbles once the TSC watchdog notices. + [x86] nowatchdog: disable clocksource watchdog. Used + in situations with strict latency requirements (where + interruptions from clocksource watchdog are not + acceptable). turbografx.map[2|3]= [HW,JOY] TurboGraFX parallel port interface
arch/x86/kernel/tsc.c +4 -1
@@ -283,6 +283,7 @@ int __init notsc_setup(char *str)__setup ("notsc" , notsc_setup);static int no_sched_irq_time; +static int no_tsc_watchdog;static int __init tsc_setup (char *str) {
@@ -292,6 +293,8 @@ static int __init tsc_setup(char *str) no_sched_irq_time =1 ;if (!strcmp (str,"unstable" ))mark_tsc_unstable ("boot parameter" ); +if (!strcmp (str,"nowatchdog" )) + no_tsc_watchdog =1 ;return 1 ; }
@@ -1349,7 +1352,7 @@ static int __init init_tsc_clocksource(void)if (tsc_unstable) goto unreg; -if (tsc_clocksource_reliable) +if (tsc_clocksource_reliable || no_tsc_watchdog) clocksource_tsc.flags &= ~CLOCK_SOURCE_MUST_VERIFY ;if (boot_cpu_has (X86_FEATURE_NONSTOP_TSC_S3 ))
arch/x86/lib/delay.c +1 -1
@@ -162,7 +162,7 @@ void __delay(unsigned long loops) }EXPORT_SYMBOL (__delay); -void __const_udelay (unsigned long xloops) +noinline void __const_udelay(unsigned long xloops) {unsigned long lpj =this_cpu_read (cpu_info.loops_per_jiffy) ? : loops_per_jiffy;int d0;
The pull request you sent on Mon, 6 May 2019 12:52:12 +0200:
The pull request you sent on Mon, 6 May 2019 12:52:12 +0200:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gitx86-timers-for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/db10ad041b318a07985363e243742a07f4b0f44b
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker