aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/microcode
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/cpu/microcode')
-rw-r--r--arch/x86/kernel/cpu/microcode/core.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
index faec7120c508..bca4e48b531d 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -43,16 +43,8 @@
43#define MICROCODE_VERSION "2.01" 43#define MICROCODE_VERSION "2.01"
44 44
45static struct microcode_ops *microcode_ops; 45static struct microcode_ops *microcode_ops;
46
47static bool dis_ucode_ldr; 46static bool dis_ucode_ldr;
48 47
49static int __init disable_loader(char *str)
50{
51 dis_ucode_ldr = true;
52 return 1;
53}
54__setup("dis_ucode_ldr", disable_loader);
55
56/* 48/*
57 * Synchronization. 49 * Synchronization.
58 * 50 *
@@ -81,15 +73,16 @@ struct cpu_info_ctx {
81 73
82static bool __init check_loader_disabled_bsp(void) 74static bool __init check_loader_disabled_bsp(void)
83{ 75{
76 static const char *__dis_opt_str = "dis_ucode_ldr";
77
84#ifdef CONFIG_X86_32 78#ifdef CONFIG_X86_32
85 const char *cmdline = (const char *)__pa_nodebug(boot_command_line); 79 const char *cmdline = (const char *)__pa_nodebug(boot_command_line);
86 const char *opt = "dis_ucode_ldr"; 80 const char *option = (const char *)__pa_nodebug(__dis_opt_str);
87 const char *option = (const char *)__pa_nodebug(opt);
88 bool *res = (bool *)__pa_nodebug(&dis_ucode_ldr); 81 bool *res = (bool *)__pa_nodebug(&dis_ucode_ldr);
89 82
90#else /* CONFIG_X86_64 */ 83#else /* CONFIG_X86_64 */
91 const char *cmdline = boot_command_line; 84 const char *cmdline = boot_command_line;
92 const char *option = "dis_ucode_ldr"; 85 const char *option = __dis_opt_str;
93 bool *res = &dis_ucode_ldr; 86 bool *res = &dis_ucode_ldr;
94#endif 87#endif
95 88