diff options
| author | Jeremy Fitzhardinge <jeremy@xensource.com> | 2008-02-29 18:55:43 +0100 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2008-04-18 18:53:20 -0700 |
| commit | cf0a0d639cb8feee43f455bdb31454742337225d (patch) | |
| tree | 06ce136b4bf86f901d9680d2cffadbf958996e03 /arch | |
| parent | 47faf947315d8abeaf5ec90a906e47a24e0657dd (diff) | |
xen: mask out SEP from CPUID
upstream commit: d40e705903397445c6861a0a56c23e5b2e8f9b9a
Fix 32-on-64 pvops kernel:
we don't want userspace using syscall/sysenter, even if the hypervisor
supports it, so mask it out from CPUID.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index b6af3ea43c73..228f6c729bcc 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -153,6 +153,7 @@ static void xen_cpuid(unsigned int *eax, unsigned int *ebx, if (*eax == 1) maskedx = ~((1 << X86_FEATURE_APIC) | /* disable APIC */ (1 << X86_FEATURE_ACPI) | /* disable ACPI */ + (1 << X86_FEATURE_SEP) | /* disable SEP */ (1 << X86_FEATURE_ACC)); /* thermal monitoring */ asm(XEN_EMULATE_PREFIX "cpuid" |