Commit 9399ea1c authored Aug 08, 2023 by Greg Kroah-Hartman

x86: fix backwards merge of GDS/SRSO bit

Stable-tree-only change.

Due to the way the GDS and SRSO patches flowed into the stable tree, it
was a 50% chance that the merge of the which value GDS and SRSO should
be.  Of course, I lost that bet, and chose the opposite of what Linus
chose in commit 64094e7e3118 ("Merge tag 'gds-for-linus-2023-08-01' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip"

)

Fix this up by switching the values to match what is now in Linus's tree
as that is the correct value to mirror.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent bc7b9a6c

arch/x86/kernel/cpu/common.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -1135,8 +1135,12 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = {
		#define MMIO_SBDS BIT(2)
		/* CPU is affected by RETbleed, speculating where you would not expect it */
		#define RETBLEED BIT(3)
		/* CPU is affected by SMT (cross-thread) return predictions */
		#define SMT_RSB BIT(4)
		/* CPU is affected by SRSO */
		#define SRSO BIT(5)
		/* CPU is affected by GDS */
		#define GDS BIT(4)
		#define GDS BIT(6)

		static const struct x86_cpu_id cpu_vuln_blacklist[] __initconst = {
		VULNBL_INTEL_STEPPINGS(IVYBRIDGE, X86_STEPPING_ANY, SRBDS),