Skip to content

Commit 3394ef1

Browse files
konradwilkgregkh
authored andcommitted
x86/bugs: Rename SSBD_NO to SSB_NO
commit 240da95 upstream The "336996 Speculative Execution Side Channel Mitigations" from May defines this as SSB_NO, hence lets sync-up. Signed-off-by: Konrad Rzeszutek Wilk <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: David Woodhouse <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent b965592 commit 3394ef1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/x86/include/asm/msr-index.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
#define MSR_IA32_ARCH_CAPABILITIES 0x0000010a
6464
#define ARCH_CAP_RDCL_NO (1 << 0) /* Not susceptible to Meltdown */
6565
#define ARCH_CAP_IBRS_ALL (1 << 1) /* Enhanced IBRS support */
66-
#define ARCH_CAP_SSBD_NO (1 << 4) /*
66+
#define ARCH_CAP_SSB_NO (1 << 4) /*
6767
* Not susceptible to Speculative Store Bypass
6868
* attack, so no Speculative Store Bypass
6969
* control required.

arch/x86/kernel/cpu/common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,7 @@ static void __init cpu_set_bug_bits(struct cpuinfo_x86 *c)
926926
rdmsrl(MSR_IA32_ARCH_CAPABILITIES, ia32_cap);
927927

928928
if (!x86_match_cpu(cpu_no_spec_store_bypass) &&
929-
!(ia32_cap & ARCH_CAP_SSBD_NO))
929+
!(ia32_cap & ARCH_CAP_SSB_NO))
930930
setup_force_cpu_bug(X86_BUG_SPEC_STORE_BYPASS);
931931

932932
if (x86_match_cpu(cpu_no_speculation))

0 commit comments

Comments
 (0)