File tree Expand file tree Collapse file tree 3 files changed +5
-5
lines changed
Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -2561,7 +2561,7 @@ config MITIGATION_IBPB_ENTRY
25612561 help
25622562 Compile the kernel with support for the retbleed=ibpb mitigation.
25632563
2564- config CPU_IBRS_ENTRY
2564+ config MITIGATION_IBRS_ENTRY
25652565 bool "Enable IBRS on kernel entry"
25662566 depends on CPU_SUP_INTEL && X86_64
25672567 default y
Original file line number Diff line number Diff line change @@ -303,7 +303,7 @@ For 32-bit we have the following conventions - kernel is built with
303303 * Assumes x86_spec_ctrl_{base,current} to have SPEC_CTRL_IBRS set.
304304 */
305305.macro IBRS_ENTER save_reg
306- #ifdef CONFIG_CPU_IBRS_ENTRY
306+ #ifdef CONFIG_MITIGATION_IBRS_ENTRY
307307 ALTERNATIVE "jmp .Lend_ \@", "", X86_FEATURE_KERNEL_IBRS
308308 movl $MSR_IA32_SPEC_CTRL , %ecx
309309
@@ -332,7 +332,7 @@ For 32-bit we have the following conventions - kernel is built with
332332 * regs. Must be called after the last RET.
333333 */
334334.macro IBRS_EXIT save_reg
335- #ifdef CONFIG_CPU_IBRS_ENTRY
335+ #ifdef CONFIG_MITIGATION_IBRS_ENTRY
336336 ALTERNATIVE "jmp .Lend_ \@", "", X86_FEATURE_KERNEL_IBRS
337337 movl $MSR_IA32_SPEC_CTRL , %ecx
338338
Original file line number Diff line number Diff line change @@ -1439,7 +1439,7 @@ static enum spectre_v2_mitigation_cmd __init spectre_v2_parse_cmdline(void)
14391439 return SPECTRE_V2_CMD_AUTO ;
14401440 }
14411441
1442- if (cmd == SPECTRE_V2_CMD_IBRS && !IS_ENABLED (CONFIG_CPU_IBRS_ENTRY )) {
1442+ if (cmd == SPECTRE_V2_CMD_IBRS && !IS_ENABLED (CONFIG_MITIGATION_IBRS_ENTRY )) {
14431443 pr_err ("%s selected but not compiled in. Switching to AUTO select\n" ,
14441444 mitigation_options [i ].option );
14451445 return SPECTRE_V2_CMD_AUTO ;
@@ -1565,7 +1565,7 @@ static void __init spectre_v2_select_mitigation(void)
15651565 break ;
15661566 }
15671567
1568- if (IS_ENABLED (CONFIG_CPU_IBRS_ENTRY ) &&
1568+ if (IS_ENABLED (CONFIG_MITIGATION_IBRS_ENTRY ) &&
15691569 boot_cpu_has_bug (X86_BUG_RETBLEED ) &&
15701570 retbleed_cmd != RETBLEED_CMD_OFF &&
15711571 retbleed_cmd != RETBLEED_CMD_STUFF &&
You can’t perform that action at this time.
0 commit comments