- Update Xen patches to 3.3-rc5 and c/s 1157.

[linux-flexiantxendom0-3.2.10.git] / arch / x86 / vdso / vdso32 / syscall.S

diff --git a/arch/x86/vdso/vdso32/syscall.S b/arch/x86/vdso/vdso32/syscall.S
index 5415b56..0a27d17 100644 (file)
--- a/arch/x86/vdso/vdso32/syscall.S
+++ b/arch/x86/vdso/vdso32/syscall.S
@@ -19,8 +19,10 @@ __kernel_vsyscall:
 .Lpush_ebp:
        movl    %ecx, %ebp
        syscall
+#ifndef CONFIG_XEN
        movl    $__USER32_DS, %ecx
        movl    %ecx, %ss
+#endif
        movl    %ebp, %ecx
        popl    %ebp
 .Lpop_ebp: