Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-drm-fsl-dcu.git] / arch / x86_64 / ia32 / ia32entry.S

diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S
index eda7a0d4dc15c8050c65bcb3b2c1d81369115435..f21068378272f0b8dbce0ce1d7f8b29ccfa0b286 100644 (file)
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86_64/ia32/ia32entry.S
@@ -481,11 +481,7 @@ ia32_sys_call_table:
        .quad sys_symlink
        .quad sys_lstat
        .quad sys_readlink              /* 85 */
-#ifdef CONFIG_IA32_AOUT
        .quad sys_uselib
-#else
-       .quad quiet_ni_syscall
-#endif
        .quad sys_swapon
        .quad sys_reboot
        .quad compat_sys_old_readdir
@@ -560,7 +556,7 @@ ia32_sys_call_table:
        .quad sys_sched_yield
        .quad sys_sched_get_priority_max
        .quad sys_sched_get_priority_min  /* 160 */
-       .quad sys_sched_rr_get_interval
+       .quad sys32_sched_rr_get_interval
        .quad compat_sys_nanosleep
        .quad sys_mremap
        .quad sys_setresuid16
@@ -714,9 +710,10 @@ ia32_sys_call_table:
        .quad compat_sys_get_robust_list
        .quad sys_splice
        .quad sys_sync_file_range
-       .quad sys_tee
+       .quad sys_tee                   /* 315 */
        .quad compat_sys_vmsplice
        .quad compat_sys_move_pages
        .quad sys_getcpu
        .quad sys_epoll_pwait
+       .quad compat_sys_utimensat      /* 320 */
 ia32_syscall_end: