Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

Pull signal/compat fixes from Al Viro:
 "Fixes for several regressions introduced in the last signal.git pile,
  along with fixing bugs in truncate and ftruncate compat (on just about
  anything biarch at least one of those two had been done wrong)."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
  compat: restore timerfd settime and gettime compat syscalls
  [regression] braino in "sparc: convert to ksignal"
  fix compat truncate/ftruncate
  switch lseek to COMPAT_SYSCALL_DEFINE
  lseek() and truncate() on sparc really need sign extension

3 files changed, 3 insertions, 9 deletions

diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
index 592f5a9a9c0e..ad7a20cbc699 100644
--- a/arch/x86/ia32/sys_ia32.c
+++ b/arch/x86/ia32/sys_ia32.c
@@ -218,11 +218,6 @@ asmlinkage long sys32_sendfile(int out_fd, int in_fd,
  * Some system calls that need sign extended arguments. This could be
  * done by a generic wrapper.
  */
-long sys32_lseek(unsigned int fd, int offset, unsigned int whence)
-{
-        return sys_lseek(fd, offset, whence);
-}
-
 long sys32_kill(int pid, int sig)
 {
         return sys_kill(pid, sig);
diff --git a/arch/x86/include/asm/sys_ia32.h b/arch/x86/include/asm/sys_ia32.h
index 0218d917f509..8459efc39686 100644
--- a/arch/x86/include/asm/sys_ia32.h
+++ b/arch/x86/include/asm/sys_ia32.h
@@ -43,7 +43,6 @@ asmlinkage long sys32_pwrite(unsigned int, const char __user *, u32, u32, u32);
 asmlinkage long sys32_personality(unsigned long);
 asmlinkage long sys32_sendfile(int, int, compat_off_t __user *, s32);
 
-long sys32_lseek(unsigned int, int, unsigned int);
 long sys32_kill(int, int);
 long sys32_fadvise64_64(int, __u32, __u32, __u32, __u32, int);
 long sys32_vm86_warning(void);
diff --git a/arch/x86/syscalls/syscall_32.tbl b/arch/x86/syscalls/syscall_32.tbl
index f2fe78ff22cc..e6d55f0064df 100644
--- a/arch/x86/syscalls/syscall_32.tbl
+++ b/arch/x86/syscalls/syscall_32.tbl
@@ -25,7 +25,7 @@
 16      i386    lchown                  sys_lchown16
 17      i386    break
 18      i386    oldstat                 sys_stat
-19      i386    lseek                   sys_lseek                       sys32_lseek
+19      i386    lseek                   sys_lseek                       compat_sys_lseek
 20      i386    getpid                  sys_getpid
 21      i386    mount                   sys_mount                       compat_sys_mount
 22      i386    umount                  sys_oldumount
@@ -98,8 +98,8 @@
 89      i386    readdir                 sys_old_readdir                 compat_sys_old_readdir
 90      i386    mmap                    sys_old_mmap                    sys32_mmap
 91      i386    munmap                  sys_munmap
-92      i386    truncate                sys_truncate
-93      i386    ftruncate               sys_ftruncate
+92      i386    truncate                sys_truncate                    compat_sys_truncate
+93      i386    ftruncate               sys_ftruncate                   compat_sys_ftruncate
 94      i386    fchmod                  sys_fchmod
 95      i386    fchown                  sys_fchown16
 96      i386    getpriority             sys_getpriority