linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / x86_64 / ia32 / ia32entry.S

diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S
index 6595b35..f331a49 100644 (file)
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86_64/ia32/ia32entry.S
@@ -15,8 +15,6 @@
 #include <asm/vsyscall32.h>
 #include <linux/linkage.h>
 
-#define IA32_NR_syscalls ((ia32_syscall_end - ia32_sys_call_table)/8)
-
        .macro IA32_ARG_FIXUP noebp=0
        movl    %edi,%r8d
        .if \noebp
@@ -111,8 +109,8 @@ ENTRY(ia32_sysenter_target)
        CFI_REMEMBER_STATE
        jnz  sysenter_tracesys
 sysenter_do_call:      
-       cmpl    $(IA32_NR_syscalls-1),%eax
-       ja      ia32_badsys
+       cmpl    $(IA32_NR_syscalls),%eax
+       jae     ia32_badsys
        IA32_ARG_FIXUP 1
        call    *ia32_sys_call_table(,%rax,8)
        movq    %rax,RAX-ARGOFFSET(%rsp)
@@ -212,8 +210,8 @@ ENTRY(ia32_cstar_target)
        CFI_REMEMBER_STATE
        jnz   cstar_tracesys
 cstar_do_call: 
-       cmpl $IA32_NR_syscalls-1,%eax
-       ja  ia32_badsys
+       cmpl $IA32_NR_syscalls,%eax
+       jae  ia32_badsys
        IA32_ARG_FIXUP 1
        call *ia32_sys_call_table(,%rax,8)
        movq %rax,RAX-ARGOFFSET(%rsp)
@@ -298,8 +296,8 @@ ENTRY(ia32_syscall)
        testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),threadinfo_flags(%r10)
        jnz ia32_tracesys
 ia32_do_syscall:       
-       cmpl $(IA32_NR_syscalls-1),%eax
-       ja  ia32_badsys
+       cmpl $(IA32_NR_syscalls),%eax
+       jae  ia32_badsys
        IA32_ARG_FIXUP
        call *ia32_sys_call_table(,%rax,8) # xxx: rip relative
 ia32_sysret:
@@ -503,7 +501,7 @@ ia32_sys_call_table:
        .quad sys_setdomainname
        .quad sys_uname
        .quad sys_modify_ldt
-       .quad compat_sys_adjtimex
+       .quad sys32_adjtimex
        .quad sys32_mprotect            /* 125 */
        .quad compat_sys_sigprocmask
        .quad quiet_ni_syscall          /* create_module */
@@ -601,15 +599,7 @@ ia32_sys_call_table:
        .quad sys_madvise
        .quad compat_sys_getdents64     /* 220 getdents64 */
        .quad compat_sys_fcntl64        
-#ifdef CONFIG_TUX
-       .quad __sys_tux
-#else
-# ifdef CONFIG_TUX_MODULE
-       .quad sys_tux
-# else
-       .quad quiet_ni_syscall
-# endif
-#endif
+       .quad quiet_ni_syscall          /* tux */
        .quad quiet_ni_syscall          /* security */
        .quad sys_gettid        
        .quad sys_readahead     /* 225 */
@@ -695,13 +685,10 @@ ia32_sys_call_table:
        .quad sys_readlinkat            /* 305 */
        .quad sys_fchmodat
        .quad sys_faccessat
-       .quad quiet_ni_syscall          /* pselect6 for now */
-       .quad quiet_ni_syscall          /* ppoll for now */
+       .quad sys_ni_syscall            /* pselect6 for now */
+       .quad sys_ni_syscall            /* ppoll for now */
        .quad sys_unshare               /* 310 */
-       .quad compat_sys_set_robust_list
-       .quad compat_sys_get_robust_list
-       .quad sys_splice
-       .quad sys_sync_file_range
-       .quad sys_tee
-       .quad compat_sys_vmsplice
 ia32_syscall_end:              
+       .rept IA32_NR_syscalls-(ia32_syscall_end-ia32_sys_call_table)/8
+               .quad ni_syscall
+       .endr