Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[sfrench/cifs-2.6.git] / arch / x86 / entry / syscalls / syscall_32.tbl

diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl
index 3fe02546aed35ba16a6142bfd26ad4869c50e65f..15908eb9b17e5eeda97e867b85da2f261f019503 100644 (file)
--- a/arch/x86/entry/syscalls/syscall_32.tbl
+++ b/arch/x86/entry/syscalls/syscall_32.tbl
@@ -124,13 +124,13 @@
 110    i386    iopl                    sys_iopl                        __ia32_sys_iopl
 111    i386    vhangup                 sys_vhangup                     __ia32_sys_vhangup
 112    i386    idle
-113    i386    vm86old                 sys_vm86old                     sys_ni_syscall
+113    i386    vm86old                 sys_vm86old                     __ia32_sys_ni_syscall
 114    i386    wait4                   sys_wait4                       __ia32_compat_sys_wait4
 115    i386    swapoff                 sys_swapoff                     __ia32_sys_swapoff
 116    i386    sysinfo                 sys_sysinfo                     __ia32_compat_sys_sysinfo
 117    i386    ipc                     sys_ipc                         __ia32_compat_sys_ipc
 118    i386    fsync                   sys_fsync                       __ia32_sys_fsync
-119    i386    sigreturn               sys_sigreturn                   sys32_sigreturn
+119    i386    sigreturn               sys_sigreturn                   __ia32_compat_sys_sigreturn
 120    i386    clone                   sys_clone                       __ia32_compat_sys_x86_clone
 121    i386    setdomainname           sys_setdomainname               __ia32_sys_setdomainname
 122    i386    uname                   sys_newuname                    __ia32_sys_newuname
@@ -177,14 +177,14 @@
 163    i386    mremap                  sys_mremap                      __ia32_sys_mremap
 164    i386    setresuid               sys_setresuid16                 __ia32_sys_setresuid16
 165    i386    getresuid               sys_getresuid16                 __ia32_sys_getresuid16
-166    i386    vm86                    sys_vm86                        sys_ni_syscall
+166    i386    vm86                    sys_vm86                        __ia32_sys_ni_syscall
 167    i386    query_module
 168    i386    poll                    sys_poll                        __ia32_sys_poll
 169    i386    nfsservctl
 170    i386    setresgid               sys_setresgid16                 __ia32_sys_setresgid16
 171    i386    getresgid               sys_getresgid16                 __ia32_sys_getresgid16
 172    i386    prctl                   sys_prctl                       __ia32_sys_prctl
-173    i386    rt_sigreturn            sys_rt_sigreturn                sys32_rt_sigreturn
+173    i386    rt_sigreturn            sys_rt_sigreturn                __ia32_compat_sys_rt_sigreturn
 174    i386    rt_sigaction            sys_rt_sigaction                __ia32_compat_sys_rt_sigaction
 175    i386    rt_sigprocmask          sys_rt_sigprocmask              __ia32_compat_sys_rt_sigprocmask
 176    i386    rt_sigpending           sys_rt_sigpending               __ia32_compat_sys_rt_sigpending