diff options
| author | Jeremy Fitzhardinge <jeremy@xensource.com> | 2008-02-29 18:55:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-02-29 18:55:43 +0100 |
| commit | d40e705903397445c6861a0a56c23e5b2e8f9b9a (patch) | |
| tree | b9a4a434fb482508f98dcf5f261deda1b6d1c610 /arch/x86/xen | |
| parent | 53c58588107973c0e240a1ed4fb8295f274c409d (diff) | |
| download | linux-3.10-d40e705903397445c6861a0a56c23e5b2e8f9b9a.tar.gz linux-3.10-d40e705903397445c6861a0a56c23e5b2e8f9b9a.tar.bz2 linux-3.10-d40e705903397445c6861a0a56c23e5b2e8f9b9a.zip | |
xen: mask out SEP from CPUID
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>
Diffstat (limited to 'arch/x86/xen')
| -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 49e5358f481..8b9ee27805f 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -153,6 +153,7 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, if (*ax == 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" |