Skip to content

Commit 62e7246

Browse files
shechenglong-fusionwilldeacon
authored andcommitted
arm64: proton-pack: Drop print when !CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY
Following the pattern established with other Spectre mitigations, do not print a message when the CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY Kconfig option is disabled. Suggested-by: Will Deacon <[email protected]> Signed-off-by: shechenglong <[email protected]> Signed-off-by: Will Deacon <[email protected]>
1 parent 53357f1 commit 62e7246

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

arch/arm64/kernel/proton-pack.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,8 +1042,6 @@ void spectre_bhb_enable_mitigation(const struct arm64_cpu_capabilities *entry)
10421042

10431043
if (arm64_get_spectre_v2_state() == SPECTRE_VULNERABLE) {
10441044
/* No point mitigating Spectre-BHB alone. */
1045-
} else if (!IS_ENABLED(CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY)) {
1046-
pr_info_once("spectre-bhb mitigation disabled by compile time option\n");
10471045
} else if (cpu_mitigations_off() || __nospectre_bhb) {
10481046
pr_info_once("spectre-bhb mitigation disabled by command line option\n");
10491047
} else if (supports_ecbhb(SCOPE_LOCAL_CPU)) {

0 commit comments

Comments
 (0)