| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <174748683998.406.15770168024331455064.tip-bot2@tip-bot2>
Date: Sat, 17 May 2025 13:00:39 -0000
From: "tip-bot2 for Borislav Petkov (AMD)" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: "Borislav Petkov (AMD)" <bp@...en8.de>, Ingo Molnar <mingo@...nel.org>,
x86@...nel.org, linux-kernel@...r.kernel.org
Subject: [tip: x86/merge] x86/bugs: Fix indentation due to ITS merge
The following commit has been merged into the x86/merge branch of tip:
Commit-ID: a0f3fe547eb35a2dc298a78da73da73304f41ce1
Gitweb: https://git.kernel.org/tip/a0f3fe547eb35a2dc298a78da73da73304f41ce1
Author: Borislav Petkov (AMD) <bp@...en8.de>
AuthorDate: Fri, 16 May 2025 16:31:38 +02:00
Committer: Ingo Molnar <mingo@...nel.org>
CommitterDate: Sat, 17 May 2025 10:33:32 +02:00
x86/bugs: Fix indentation due to ITS merge
No functional changes.
Signed-off-by: Borislav Petkov (AMD) <bp@...en8.de>
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/kernel/cpu/bugs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index dd8b50b..d1a03ff 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -2975,10 +2975,10 @@ static void __init srso_apply_mitigation(void)
if (boot_cpu_data.x86 == 0x19) {
setup_force_cpu_cap(X86_FEATURE_SRSO_ALIAS);
- set_return_thunk(srso_alias_return_thunk);
+ set_return_thunk(srso_alias_return_thunk);
} else {
setup_force_cpu_cap(X86_FEATURE_SRSO);
- set_return_thunk(srso_return_thunk);
+ set_return_thunk(srso_return_thunk);
}
break;
case SRSO_MITIGATION_IBPB:
Powered by blists - more mailing lists