diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-05-11 21:08:55 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-05-11 21:08:55 +0300 |
| commit | b9e62a2b8ffd2bc39b5838e163c41d8a08dae19a (patch) | |
| tree | 2123eacf3ead30ad69d3d787f320b9d6b086f852 /arch/x86/include/asm/microcode.h | |
| parent | ac814cbbab21ad0a1ba1554312687e4abbfcfc96 (diff) | |
| parent | 5214a9f6c0f56644acb9d2cbb58facf1856d322b (diff) | |
| download | linux-b9e62a2b8ffd2bc39b5838e163c41d8a08dae19a.tar.xz | |
Merge tag 'x86-urgent-2025-05-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Ingo Molnar:
"Fix a boot regression on very old x86 CPUs without CPUID support"
* tag 'x86-urgent-2025-05-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/microcode: Consolidate the loader enablement checking
Diffstat (limited to 'arch/x86/include/asm/microcode.h')
| -rw-r--r-- | arch/x86/include/asm/microcode.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h index 695e569159c1..be7cddc414e4 100644 --- a/arch/x86/include/asm/microcode.h +++ b/arch/x86/include/asm/microcode.h @@ -17,10 +17,12 @@ struct ucode_cpu_info { void load_ucode_bsp(void); void load_ucode_ap(void); void microcode_bsp_resume(void); +bool __init microcode_loader_disabled(void); #else static inline void load_ucode_bsp(void) { } static inline void load_ucode_ap(void) { } static inline void microcode_bsp_resume(void) { } +static inline bool __init microcode_loader_disabled(void) { return false; } #endif extern unsigned long initrd_start_early; |