diff options
author | Ingo Molnar | 2018-12-17 18:48:25 +0100 |
---|---|---|
committer | Ingo Molnar | 2018-12-17 18:48:25 +0100 |
commit | 02117e42db7470e59910088b2b0ee42d581d2651 (patch) | |
tree | 7734414b46fb72ffc708ac924f3b6b69de1f0d4c /arch/x86/include/asm/msr-index.h | |
parent | x86/mm: Drop usage of __flush_tlb_all() in kernel_physical_mapping_init() (diff) | |
parent | x86/mm/cpa: Fix cpa_flush_array() TLB invalidation (diff) | |
download | kernel-qcow2-linux-02117e42db7470e59910088b2b0ee42d581d2651.tar.gz kernel-qcow2-linux-02117e42db7470e59910088b2b0ee42d581d2651.tar.xz kernel-qcow2-linux-02117e42db7470e59910088b2b0ee42d581d2651.zip |
Merge branch 'x86/urgent' into x86/mm, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/msr-index.h')
-rw-r--r-- | arch/x86/include/asm/msr-index.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 80f4a4f38c79..c8f73efb4ece 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -41,9 +41,10 @@ #define MSR_IA32_SPEC_CTRL 0x00000048 /* Speculation Control */ #define SPEC_CTRL_IBRS (1 << 0) /* Indirect Branch Restricted Speculation */ -#define SPEC_CTRL_STIBP (1 << 1) /* Single Thread Indirect Branch Predictors */ +#define SPEC_CTRL_STIBP_SHIFT 1 /* Single Thread Indirect Branch Predictor (STIBP) bit */ +#define SPEC_CTRL_STIBP (1 << SPEC_CTRL_STIBP_SHIFT) /* STIBP mask */ #define SPEC_CTRL_SSBD_SHIFT 2 /* Speculative Store Bypass Disable bit */ -#define SPEC_CTRL_SSBD (1 << SPEC_CTRL_SSBD_SHIFT) /* Speculative Store Bypass Disable */ +#define SPEC_CTRL_SSBD (1 << SPEC_CTRL_SSBD_SHIFT) /* Speculative Store Bypass Disable */ #define MSR_IA32_PRED_CMD 0x00000049 /* Prediction Command */ #define PRED_CMD_IBPB (1 << 0) /* Indirect Branch Prediction Barrier */ |