diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-30 10:19:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-30 10:19:11 -0700 |
| commit | a23cbb05744b22719efdc34f9e329a120e81e617 (patch) | |
| tree | f16d636557c5c6bf2e5528f926e64a2fb41da260 /arch | |
| parent | 637836563deb95f4338decf2d2d832c4deef022a (diff) | |
| parent | 64f74d8f728877858372c52067e5c0c091f8db24 (diff) | |
| download | linux-a23cbb05744b22719efdc34f9e329a120e81e617.tar.gz linux-a23cbb05744b22719efdc34f9e329a120e81e617.zip | |
Merge tag 'timers-urgent-2026-08-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Ingo Molnar:
- Fix UM build regression caused by the removal of the UM
specific timex.h header (Thomas Weißschuh)
* tag 'timers-urgent-2026-08-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
um: Use asm-generic/timex.h over the host architecture one
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/include/asm/timex.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/um/include/asm/timex.h b/arch/um/include/asm/timex.h new file mode 100644 index 000000000000..39e392ebc8c2 --- /dev/null +++ b/arch/um/include/asm/timex.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __UM_TIMEX_H +#define __UM_TIMEX_H + +/* + * Do not fall back to the host architecture header because latter likely + * includes facilities like cpu_feature_enabled() which are present only + * there. That would result in build breakages and/or efforts to "emulate" + * those facilities in UML. + */ +#include <asm-generic/timex.h> + +#endif |