This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / i386 / kernel / vsyscall-sysenter.S

diff --git a/arch/i386/kernel/vsyscall-sysenter.S b/arch/i386/kernel/vsyscall-sysenter.S
index cb54c01..cb421be 100644 (file)
--- a/arch/i386/kernel/vsyscall-sysenter.S
+++ b/arch/i386/kernel/vsyscall-sysenter.S
@@ -12,6 +12,11 @@
        .type __kernel_vsyscall,@function
 __kernel_vsyscall:
 .LSTART_vsyscall:
+       cmpl $192, %eax
+       jne 1f
+       int $0x80
+       ret
+1:
        push %ecx
 .Lpush_ecx:
        push %edx
@@ -24,11 +29,11 @@ __kernel_vsyscall:
        /* 7: align return point with nop's to make disassembly easier */
        .space 7,0x90
 
-       /* 14: System call restart point is here! (SYSENTER_RETURN - 2) */
+       /* 14: System call restart point is here! (SYSENTER_RETURN_OFFSET-2) */
        jmp .Lenter_kernel
        /* 16: System call normal return point is here! */
-       .globl SYSENTER_RETURN  /* Symbol used by entry.S.  */
-SYSENTER_RETURN:
+       .globl SYSENTER_RETURN_OFFSET   /* Symbol used by sysenter.c  */
+SYSENTER_RETURN_OFFSET:
        pop %ebp
 .Lpop_ebp:
        pop %edx