aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/bugs.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/cpu/bugs.c')
-rw-r--r--arch/x86/kernel/cpu/bugs.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index feb7d597c265..00f51deba493 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -36,6 +36,7 @@ static void __init ssb_select_mitigation(void);
36 * writes to SPEC_CTRL contain whatever reserved bits have been set. 36 * writes to SPEC_CTRL contain whatever reserved bits have been set.
37 */ 37 */
38u64 __ro_after_init x86_spec_ctrl_base; 38u64 __ro_after_init x86_spec_ctrl_base;
39EXPORT_SYMBOL_GPL(x86_spec_ctrl_base);
39 40
40/* 41/*
41 * The vendor and possibly platform specific bits which can be modified in 42 * The vendor and possibly platform specific bits which can be modified in
@@ -141,16 +142,6 @@ void x86_spec_ctrl_set(u64 val)
141} 142}
142EXPORT_SYMBOL_GPL(x86_spec_ctrl_set); 143EXPORT_SYMBOL_GPL(x86_spec_ctrl_set);
143 144
144u64 x86_spec_ctrl_get_default(void)
145{
146 u64 msrval = x86_spec_ctrl_base;
147
148 if (static_cpu_has(X86_FEATURE_SPEC_CTRL))
149 msrval |= ssbd_tif_to_spec_ctrl(current_thread_info()->flags);
150 return msrval;
151}
152EXPORT_SYMBOL_GPL(x86_spec_ctrl_get_default);
153
154void 145void
155x86_virt_spec_ctrl(u64 guest_spec_ctrl, u64 guest_virt_spec_ctrl, bool setguest) 146x86_virt_spec_ctrl(u64 guest_spec_ctrl, u64 guest_virt_spec_ctrl, bool setguest)
156{ 147{