* [tip: x86/merge] x86/bugs: Fix indentation due to ITS merge
@ 2025-05-17 13:00 tip-bot2 for Borislav Petkov (AMD)
0 siblings, 0 replies; only message in thread
From: tip-bot2 for Borislav Petkov (AMD) @ 2025-05-17 13:00 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Borislav Petkov (AMD), Ingo Molnar, x86, linux-kernel
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@alien8.de>
AuthorDate: Fri, 16 May 2025 16:31:38 +02:00
Committer: Ingo Molnar <mingo@kernel.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@alien8.de>
Signed-off-by: Ingo Molnar <mingo@kernel.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:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-05-17 13:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-05-17 13:00 [tip: x86/merge] x86/bugs: Fix indentation due to ITS merge tip-bot2 for Borislav Petkov (AMD)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®