diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2022-04-22 12:32:01 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2022-04-22 12:32:01 +0200 |
| commit | 3398b12d10271c008ed48fecc6577a5940d7cdf3 (patch) | |
| tree | a42c0f8e5bf46ee32ea5d2520b385f1b8546d8ed /arch/x86/include/asm/microcode.h | |
| parent | 4abff6d48dbcea8200c7ea35ba70c242d128ebf3 (diff) | |
| parent | 4cdfc11b2836e659c0b7b31152a8b0d976167b59 (diff) | |
Merge branch 'tip/x86/urgent'
Merge the x86/urgent objtool/IBT changes as a base
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
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 d6bfdfb0f0af..0c3d3440fe27 100644 --- a/arch/x86/include/asm/microcode.h +++ b/arch/x86/include/asm/microcode.h @@ -131,10 +131,12 @@ extern void __init load_ucode_bsp(void); extern void load_ucode_ap(void); void reload_early_microcode(void); extern bool initrd_gone; +void microcode_bsp_resume(void); #else static inline void __init load_ucode_bsp(void) { } static inline void load_ucode_ap(void) { } static inline void reload_early_microcode(void) { } +static inline void microcode_bsp_resume(void) { } #endif #endif /* _ASM_X86_MICROCODE_H */ |