Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 474928b8 authored by Juergen Gross's avatar Juergen Gross Committed by Greg Kroah-Hartman
Browse files

x86/amd: revert commit 944e0fc5 



Revert commit 944e0fc5 ("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: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 219270d7

arch/x86/kernel/cpu/amd.c

+2 −3
Original line number Diff line number Diff line
@@ -857,8 +857,7 @@ static void init_amd(struct cpuinfo_x86 *c) 
		if (cpu_has(c, X86_FEATURE_3DNOW) || cpu_has(c, X86_FEATURE_LM))

			set_cpu_cap(c, X86_FEATURE_3DNOWPREFETCH);



	/* AMD CPUs don't reset SS attributes on SYSRET, Xen does. */

	if (!cpu_has(c, X86_FEATURE_XENPV))

	/* AMD CPUs don't reset SS attributes on SYSRET */

	set_cpu_bug(c, X86_BUG_SYSRET_SS_ATTRS);

}

arch/x86/xen/enlighten.c

+3 −1
Original line number Diff line number Diff line
@@ -1980,9 +1980,11 @@ 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)

{