diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-18 15:58:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-18 15:58:29 -0700 |
| commit | 030c9f813b8e48d2b066983c94cf6294968f9496 (patch) | |
| tree | 9a9fc6f2fe2e9cc3b0558c5a92ebeb6e6b8d361a /arch/x86/kernel | |
| parent | 0dd1a54f44348d9cf6bae57a2b5cb0b53826a2c7 (diff) | |
| parent | dfc256dac54c8b692110bf905c64cb130e15963d (diff) | |
Merge tag 'timers-cleanups-2026-08-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull treewide timer related cleanups from Thomas Gleixner:
- Remove the leftover CLOCK_TICK_RATE which has been scheduled for
removal more than a decade ago along with some now empty asm/timex.h
files.
- Consolidate delay timer calibration
The construct of having a define in a header requires that
architectures provided asm/timex.h for no reason. Also the function
name for reading the delay timer is confusing at best.
Use a config switch to enable that functionality and rename the
function to delay_read_timer() to make the purpose clear.
This removes some more now empty asm/timex.h files as well.
* tag 'timers-cleanups-2026-08-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
calibrate: Rework delay timer calibration
treewide: Remove CLOCK_TICK_RATE
x86: Use PIT_TICK_RATE instead of CLOCK_TICK_RATE
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index fca42b178b3c..1cc4aa65930c 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1267,7 +1267,7 @@ void __init setup_arch(char **cmdline_p) mcheck_init(); - register_refined_jiffies(CLOCK_TICK_RATE); + register_refined_jiffies(PIT_TICK_RATE); #ifdef CONFIG_EFI if (efi_enabled(EFI_BOOT)) |