diff options
| author | Juergen Gross <jgross@suse.com> | 2018-05-30 14:09:56 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-06-06 17:44:34 +0300 |
| commit | 474928b8f0a6ba49872ef2769610b80638820aad (patch) | |
| tree | 73e84119e16e3eb5df16304144247f68af4da761 /arch/x86/xen/enlighten.c | |
| parent | 219270d70a8783ad067e7c471eefdf27cc93b1d1 (diff) | |
| download | linux-474928b8f0a6ba49872ef2769610b80638820aad.tar.xz | |
x86/amd: revert commit 944e0fc51a89c9827b9
Revert commit 944e0fc51a89c9827b98813d65dc083274777c7f ("x86/amd: don't
set X86_BUG_SYSRET_SS_ATTRS when running under Xen") as it is lacking
a prerequisite patch and is making things worse.
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/xen/enlighten.c')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index e3a3f5a64884..b19ba66c15f1 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1980,8 +1980,10 @@ EXPORT_SYMBOL_GPL(xen_hvm_need_lapic); static void xen_set_cpu_features(struct cpuinfo_x86 *c) { - if (xen_pv_domain()) + if (xen_pv_domain()) { + clear_cpu_bug(c, X86_BUG_SYSRET_SS_ATTRS); set_cpu_cap(c, X86_FEATURE_XENPV); + } } static void xen_pin_vcpu(int cpu) |