# HG changeset patch
# User kfraser@localhost.localdomain
# Date 1179219267 -3600
# Node ID 75b4c7cb007dd4cdf30321c4fbd2e67e885628c3
# Parent  a605044ecb33f64e19de95ed9a56cafea8a68a26
x86: suppress SYSCALL feature for 32on64 guests
since Xen cannot handle it.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff -r a605044ecb33 -r 75b4c7cb007d xen/arch/x86/traps.c
--- a/xen/arch/x86/traps.c	Tue May 15 09:50:36 2007 +0100
+++ b/xen/arch/x86/traps.c	Tue May 15 09:54:27 2007 +0100
@@ -597,6 +597,8 @@ static int emulate_forced_invalid_op(str
     else if ( regs->eax == 0x80000001 )
     {
         /* Modify Feature Information. */
+        if ( is_pv_32bit_vcpu(current) )
+            clear_bit(X86_FEATURE_SYSCALL % 32, &d);
         clear_bit(X86_FEATURE_RDTSCP % 32, &d);
     }
     else