diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2024-07-04 16:00:24 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2024-07-04 16:00:24 +0200 |
| commit | 0c8ea05e9b3d8e5287e2a968f2a2e744dfd31b99 (patch) | |
| tree | ba0443b74f063471c5d81d85e795e04e7e1dc79c /kernel/time/Kconfig | |
| parent | perf: Make rb_alloc_aux() return an error immediately if nr_pages <= 0 (diff) | |
| parent | x86/cpu/intel: Drop stray FAM6 check with new Intel CPU model defines (diff) | |
| download | linux-0c8ea05e9b3d8e5287e2a968f2a2e744dfd31b99.tar.gz linux-0c8ea05e9b3d8e5287e2a968f2a2e744dfd31b99.zip | |
Merge branch 'tip/x86/cpu'
The Lunarlake patches rely on the new VFM stuff.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'kernel/time/Kconfig')
| -rw-r--r-- | kernel/time/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig index fc3b1a06c981..8ebb6d5a106b 100644 --- a/kernel/time/Kconfig +++ b/kernel/time/Kconfig @@ -202,7 +202,7 @@ config HIGH_RES_TIMERS the size of the kernel image. config CLOCKSOURCE_WATCHDOG_MAX_SKEW_US - int "Clocksource watchdog maximum allowable skew (in μs)" + int "Clocksource watchdog maximum allowable skew (in microseconds)" depends on CLOCKSOURCE_WATCHDOG range 50 1000 default 125 |