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

2 files changed, 3 insertions, 13 deletions

diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
index eca69bb8ef5f..051c8b90231f 100644
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
@@ -79,16 +79,6 @@ asmlinkage long sys32_sendfile64(u32 out_fd, u32 in_fd,
                                 (loff_t __user *)offset, count);
 }
 
-
-/* lseek() needs a wrapper because 'offset' can be negative, but the top
- * half of the argument has been zeroed by syscall.S.
- */
-
-asmlinkage int sys32_lseek(unsigned int fd, int offset, unsigned int origin)
-{
-        return sys_lseek(fd, offset, origin);
-}
-
 asmlinkage long sys32_semctl(int semid, int semnum, int cmd, union semun arg)
 {
         union semun u;
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index fc9cab1cc2df..884b91b028f0 100644
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -76,7 +76,7 @@
         ENTRY_SAME(socket)
         /* struct stat is MAYBE identical wide and narrow ?? */
         ENTRY_COMP(newstat)
-        ENTRY_DIFF(lseek)
+        ENTRY_COMP(lseek)
         ENTRY_SAME(getpid)              /* 20 */
         /* the 'void * data' parameter may need re-packing in wide */
         ENTRY_COMP(mount)
@@ -165,8 +165,8 @@
         ENTRY_SAME(mmap2)
         ENTRY_SAME(mmap)                /* 90 */
         ENTRY_SAME(munmap)
-        ENTRY_SAME(truncate)
-        ENTRY_SAME(ftruncate)
+        ENTRY_COMP(truncate)
+        ENTRY_COMP(ftruncate)
         ENTRY_SAME(fchmod)
         ENTRY_SAME(fchown)              /* 95 */
         ENTRY_SAME(getpriority)