Remove it, as there is no more user.
Signed-off-by: Chang S. Bae <chang.seok.bae@intel.com>
---
arch/x86/include/asm/microcode.h | 10 ----------
arch/x86/kernel/cpu/microcode/core.c | 8 ++------
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
index 62d10c43da9c..a250a8849168 100644
--- a/arch/x86/include/asm/microcode.h
+++ b/arch/x86/include/asm/microcode.h
@@ -81,14 +81,4 @@ static inline u32 intel_get_microcode_revision(void)
void microcode_offline_nmi_handler(void);
-#ifdef CONFIG_MICROCODE_LATE_LOADING
-DECLARE_STATIC_KEY_FALSE(microcode_nmi_handler_enable);
-static __always_inline bool microcode_nmi_handler_enabled(void)
-{
- return static_branch_unlikely(µcode_nmi_handler_enable);
-}
-#else
-static __always_inline bool microcode_nmi_handler_enabled(void) { return false; }
-#endif
-
#endif /* _ASM_X86_MICROCODE_H */
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
index ebcc73e67af1..775233c069c7 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -324,7 +324,6 @@ struct microcode_ctrl {
bool nmi_enabled;
};
-DEFINE_STATIC_KEY_FALSE(microcode_nmi_handler_enable);
static DEFINE_PER_CPU(struct microcode_ctrl, ucode_ctrl);
static atomic_t late_cpus_in, offline_in_nmi;
static unsigned int loops_per_usec;
@@ -601,13 +600,10 @@ static int load_late_stop_cpus(bool is_safe)
*/
store_cpu_caps(&prev_info);
- if (microcode_ops->use_nmi) {
- static_branch_enable_cpuslocked(µcode_nmi_handler_enable);
+ if (microcode_ops->use_nmi)
stop_machine_nmi_cpuslocked(microcode_nmi_handler, NULL, cpu_online_mask);
- static_branch_disable_cpuslocked(µcode_nmi_handler_enable);
- } else {
+ else
stop_machine_cpuslocked(microcode_update_handler, NULL, cpu_online_mask);
- }
/* Analyze the results */
for_each_cpu_and(cpu, cpu_present_mask, &cpus_booted_once_mask) {
--
2.51.0