diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-12-08 10:26:29 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-12-08 10:26:29 +0100 |
| commit | e913b8cd4548cd0a407b7debd6ec9104e84d050d (patch) | |
| tree | 661e543af2cab13c77b21519d49534e51e319fbd /arch/x86/include/asm/microcode_intel.h | |
| parent | 2ef84b3bb97f03332f0c1edb4466b1750dcf97b5 (diff) | |
| parent | fbae4ba8c4a387e306adc9c710e5c225cece7678 (diff) | |
Merge tag 'microcode_fixes_for_3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/microcode
Pull x86 microcode fixes from Borislav Petkov:
"Reload microcode when resuming and the case when only the early loader
has been utilized.
Also, do not load the driver on paravirt guests, from Boris Ostrovsky."
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/microcode_intel.h')
| -rw-r--r-- | arch/x86/include/asm/microcode_intel.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/microcode_intel.h b/arch/x86/include/asm/microcode_intel.h index bbe296e0bce..dd4c20043ce 100644 --- a/arch/x86/include/asm/microcode_intel.h +++ b/arch/x86/include/asm/microcode_intel.h @@ -68,11 +68,13 @@ extern void __init load_ucode_intel_bsp(void); extern void load_ucode_intel_ap(void); extern void show_ucode_info_early(void); extern int __init save_microcode_in_initrd_intel(void); +void reload_ucode_intel(void); #else static inline __init void load_ucode_intel_bsp(void) {} static inline void load_ucode_intel_ap(void) {} static inline void show_ucode_info_early(void) {} static inline int __init save_microcode_in_initrd_intel(void) { return -EINVAL; } +static inline void reload_ucode_intel(void) {} #endif #if defined(CONFIG_MICROCODE_INTEL_EARLY) && defined(CONFIG_HOTPLUG_CPU) |