aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshechenglong <shechenglong@xfusion.com>2025-10-31 17:15:05 +0800
committerWill Deacon <will@kernel.org>2025-11-07 14:49:09 +0000
commit62e72463ca714073962eda450e80c5d71dfb0dcb (patch)
tree245b3bf1640b34629a1b9fcbba417096d61dd201
parent53357f14f924a06cced46069755bb10c2a6891c1 (diff)
downloadlinux-62e72463ca71.tar.gz
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 <will@kernel.org> Signed-off-by: shechenglong <shechenglong@xfusion.com> Signed-off-by: Will Deacon <will@kernel.org>
-rw-r--r--arch/arm64/kernel/proton-pack.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/kernel/proton-pack.c b/arch/arm64/kernel/proton-pack.c
index f9a32dfde00671..d833b7c1bba8fe 100644
--- a/arch/arm64/kernel/proton-pack.c
+++ b/arch/arm64/kernel/proton-pack.c
@@ -1042,8 +1042,6 @@ void spectre_bhb_enable_mitigation(const struct arm64_cpu_capabilities *entry)
if (arm64_get_spectre_v2_state() == SPECTRE_VULNERABLE) {
/* No point mitigating Spectre-BHB alone. */
- } else if (!IS_ENABLED(CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY)) {
- pr_info_once("spectre-bhb mitigation disabled by compile time option\n");
} else if (cpu_mitigations_off() || __nospectre_bhb) {
pr_info_once("spectre-bhb mitigation disabled by command line option\n");
} else if (supports_ecbhb(SCOPE_LOCAL_CPU)) {