diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2018-05-16 23:18:09 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-05-18 05:17:30 -0400 |
| commit | 240da953fcc6a9008c92fae5b1f727ee5ed167ab (patch) | |
| tree | 7d2220f310b3a8a4a03ecc6c5b39a6571ad3280e | |
| parent | bc226f07dcd3c9ef0b7f6236fe356ea4a9cb4769 (diff) | |
x86/bugs: Rename SSBD_NO to SSB_NO
The "336996 Speculative Execution Side Channel Mitigations" from
May defines this as SSB_NO, hence lets sync-up.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/include/asm/msr-index.h | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 562414d5b834..fda2114197b3 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h | |||
| @@ -70,7 +70,7 @@ | |||
| 70 | #define MSR_IA32_ARCH_CAPABILITIES 0x0000010a | 70 | #define MSR_IA32_ARCH_CAPABILITIES 0x0000010a |
| 71 | #define ARCH_CAP_RDCL_NO (1 << 0) /* Not susceptible to Meltdown */ | 71 | #define ARCH_CAP_RDCL_NO (1 << 0) /* Not susceptible to Meltdown */ |
| 72 | #define ARCH_CAP_IBRS_ALL (1 << 1) /* Enhanced IBRS support */ | 72 | #define ARCH_CAP_IBRS_ALL (1 << 1) /* Enhanced IBRS support */ |
| 73 | #define ARCH_CAP_SSBD_NO (1 << 4) /* | 73 | #define ARCH_CAP_SSB_NO (1 << 4) /* |
| 74 | * Not susceptible to Speculative Store Bypass | 74 | * Not susceptible to Speculative Store Bypass |
| 75 | * attack, so no Speculative Store Bypass | 75 | * attack, so no Speculative Store Bypass |
| 76 | * control required. | 76 | * control required. |
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index b4247ed0c81e..78decc3e3067 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c | |||
| @@ -974,7 +974,7 @@ static void __init cpu_set_bug_bits(struct cpuinfo_x86 *c) | |||
| 974 | rdmsrl(MSR_IA32_ARCH_CAPABILITIES, ia32_cap); | 974 | rdmsrl(MSR_IA32_ARCH_CAPABILITIES, ia32_cap); |
| 975 | 975 | ||
| 976 | if (!x86_match_cpu(cpu_no_spec_store_bypass) && | 976 | if (!x86_match_cpu(cpu_no_spec_store_bypass) && |
| 977 | !(ia32_cap & ARCH_CAP_SSBD_NO)) | 977 | !(ia32_cap & ARCH_CAP_SSB_NO)) |
| 978 | setup_force_cpu_bug(X86_BUG_SPEC_STORE_BYPASS); | 978 | setup_force_cpu_bug(X86_BUG_SPEC_STORE_BYPASS); |
| 979 | 979 | ||
| 980 | if (x86_match_cpu(cpu_no_speculation)) | 980 | if (x86_match_cpu(cpu_no_speculation)) |
