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
2561
2561
help
2562
2562
Compile the kernel with support for the retbleed=ibpb mitigation.
2563
2563
2564
- config CPU_IBRS_ENTRY
2564
+ config MITIGATION_IBRS_ENTRY
2565
2565
bool "Enable IBRS on kernel entry"
2566
2566
depends on CPU_SUP_INTEL && X86_64
2567
2567
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
303
303
* Assumes x86_spec_ctrl_{base,current} to have SPEC_CTRL_IBRS set.
304
304
*/
305
305
.macro IBRS_ENTER save_reg
306
- #ifdef CONFIG_CPU_IBRS_ENTRY
306
+ #ifdef CONFIG_MITIGATION_IBRS_ENTRY
307
307
ALTERNATIVE "jmp .Lend_ \@", "", X86_FEATURE_KERNEL_IBRS
308
308
movl $MSR_IA32_SPEC_CTRL , %ecx
309
309
@@ -332,7 +332,7 @@ For 32-bit we have the following conventions - kernel is built with
332
332
* regs. Must be called after the last RET.
333
333
*/
334
334
.macro IBRS_EXIT save_reg
335
- #ifdef CONFIG_CPU_IBRS_ENTRY
335
+ #ifdef CONFIG_MITIGATION_IBRS_ENTRY
336
336
ALTERNATIVE "jmp .Lend_ \@", "", X86_FEATURE_KERNEL_IBRS
337
337
movl $MSR_IA32_SPEC_CTRL , %ecx
338
338
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)
1439
1439
return SPECTRE_V2_CMD_AUTO ;
1440
1440
}
1441
1441
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 )) {
1443
1443
pr_err ("%s selected but not compiled in. Switching to AUTO select\n" ,
1444
1444
mitigation_options [i ].option );
1445
1445
return SPECTRE_V2_CMD_AUTO ;
@@ -1565,7 +1565,7 @@ static void __init spectre_v2_select_mitigation(void)
1565
1565
break ;
1566
1566
}
1567
1567
1568
- if (IS_ENABLED (CONFIG_CPU_IBRS_ENTRY ) &&
1568
+ if (IS_ENABLED (CONFIG_MITIGATION_IBRS_ENTRY ) &&
1569
1569
boot_cpu_has_bug (X86_BUG_RETBLEED ) &&
1570
1570
retbleed_cmd != RETBLEED_CMD_OFF &&
1571
1571
retbleed_cmd != RETBLEED_CMD_STUFF &&
You can’t perform that action at this time.
0 commit comments