From: Andrew Cooper Date: Wed, 28 Mar 2018 14:21:39 +0000 (+0100) Subject: x86/spec-ctrl: Rename ARCH_CAPS.SSBD_NO to SSB_NO X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~85 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ebdead29672d68fb3f44c2074f05cc0d72ffa83f;p=xen.git x86/spec-ctrl: Rename ARCH_CAPS.SSBD_NO to SSB_NO A last-minute rename of the feature occured, and the patch committed to staging was unfortunately stale. Correct it. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Release-acked-by: Juergen Gross --- diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 2ccada2f65..7db6e51351 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -216,7 +216,7 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) (caps & ARCH_CAPABILITIES_IBRS_ALL) ? " IBRS_ALL" : "", (caps & ARCH_CAPABILITIES_RDCL_NO) ? " RDCL_NO" : "", (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", - (caps & ARCH_CAPS_SSBD_NO) ? " SSBD_NO" : ""); + (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : ""); /* Compiled-in support which pertains to BTI mitigations. */ if ( IS_ENABLED(CONFIG_INDIRECT_THUNK) ) diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 0612a96749..8fbccc88a7 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -47,7 +47,7 @@ #define ARCH_CAPABILITIES_RDCL_NO (_AC(1, ULL) << 0) #define ARCH_CAPABILITIES_IBRS_ALL (_AC(1, ULL) << 1) #define ARCH_CAPS_RSBA (_AC(1, ULL) << 2) -#define ARCH_CAPS_SSBD_NO (_AC(1, ULL) << 4) +#define ARCH_CAPS_SSB_NO (_AC(1, ULL) << 4) /* Intel MSRs. Some also available on other CPUs */ #define MSR_IA32_PERFCTR0 0x000000c1