Merge branch 'misc.sparc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull sparc syscall cleanups from Al Viro:
 "sparc syscall stuff - killing pointless wrappers, conversions to
  {COMPAT_,}SYSCALL_DEFINE"

* 'misc.sparc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  sparc: get rid of asm wrapper for nis_syscall()
  sparc: switch compat {f,}truncate64() to COMPAT_SYSCALL_DEFINE
  sparc: switch compat pread64 and pwrite64 to COMPAT_SYSCALL_DEFINE
  convert compat sync_file_range() to COMPAT_SYSCALL_DEFINE
  switch sparc_remap_file_pages() to SYSCALL_DEFINE
  sparc: get rid of memory_ordering(2) wrapper
  sparc: trivial conversions to {COMPAT_,}SYSCALL_DEFINE()
  sparc: bury a zombie extern that had been that way for twenty years
  sparc: get rid of remaining SIGN... wrappers
  sparc: kill useless SIGN... wrappers
  sparc: get rid of sys_sparc_pipe() wrappers

diff --cc arch/sparc/kernel/sys_sparc32.c
index f166e5bbf506d4ba6e9e38f96210a22dfd53e0d0,c27e7e9e641be864f810bf398a996a24363a1fe3..b5da3bfdc2252d993b4e16f43c3d31d0f3b74617
--- 1/arch/sparc/kernel/sys_sparc32.c
--- 2/arch/sparc/kernel/sys_sparc32.c
+++ b/arch/sparc/kernel/sys_sparc32.c
@@@ -52,20 -52,14 +52,14 @@@
  
  #include "systbls.h"
  
- asmlinkage long sys32_truncate64(const char __user * path, unsigned long high, unsigned long low)
+ COMPAT_SYSCALL_DEFINE3(truncate64, const char __user *, path, u32, high, u32, low)
  {
-       if ((int)high < 0)
-               return -EINVAL;
-       else
-               return ksys_truncate(path, (high << 32) | low);
 -      return sys_truncate(path, ((u64)high << 32) | low);
++      return ksys_truncate(path, ((u64)high << 32) | low);
  }
  
- asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long high, unsigned long low)
+ COMPAT_SYSCALL_DEFINE3(ftruncate64, unsigned int, fd, u32, high, u32, low)
  {
-       if ((int)high < 0)
-               return -EINVAL;
-       else
-               return ksys_ftruncate(fd, (high << 32) | low);
 -      return sys_ftruncate(fd, ((u64)high << 32) | low);
++      return ksys_ftruncate(fd, ((u64)high << 32) | low);
  }
  
  static int cp_compat_stat64(struct kstat *stat,
@@@ -194,62 -188,51 +188,51 @@@ COMPAT_SYSCALL_DEFINE5(rt_sigaction, in
          return ret;
  }
  
- asmlinkage compat_ssize_t sys32_pread64(unsigned int fd,
-                                       char __user *ubuf,
-                                       compat_size_t count,
-                                       unsigned long poshi,
-                                       unsigned long poslo)
+ COMPAT_SYSCALL_DEFINE5(pread64, unsigned int, fd, char __user *, ubuf,
+                       compat_size_t, count, u32, poshi, u32, poslo)
  {
-       return ksys_pread64(fd, ubuf, count, (poshi << 32) | poslo);
 -      return sys_pread64(fd, ubuf, count, ((u64)poshi << 32) | poslo);
++      return ksys_pread64(fd, ubuf, count, ((u64)poshi << 32) | poslo);
  }
  
- asmlinkage compat_ssize_t sys32_pwrite64(unsigned int fd,
-                                        char __user *ubuf,
-                                        compat_size_t count,
-                                        unsigned long poshi,
-                                        unsigned long poslo)
+ COMPAT_SYSCALL_DEFINE5(pwrite64, unsigned int, fd, char __user *, ubuf,
+                       compat_size_t, count, u32, poshi, u32, poslo)
  {
-       return ksys_pwrite64(fd, ubuf, count, (poshi << 32) | poslo);
 -      return sys_pwrite64(fd, ubuf, count, ((u64)poshi << 32) | poslo);
++      return ksys_pwrite64(fd, ubuf, count, ((u64)poshi << 32) | poslo);
  }
  
- asmlinkage long compat_sys_readahead(int fd,
-                                    unsigned long offhi,
-                                    unsigned long offlo,
-                                    compat_size_t count)
+ COMPAT_SYSCALL_DEFINE4(readahead, int, fd, u32, offhi, u32, offlo,
+                    compat_size_t, count)
  {
-       return ksys_readahead(fd, (offhi << 32) | offlo, count);
 -      return sys_readahead(fd, ((u64)offhi << 32) | offlo, count);
++      return ksys_readahead(fd, ((u64)offhi << 32) | offlo, count);
  }
  
- long compat_sys_fadvise64(int fd,
-                         unsigned long offhi,
-                         unsigned long offlo,
-                         compat_size_t len, int advice)
+ COMPAT_SYSCALL_DEFINE5(fadvise64, int, fd, u32, offhi, u32, offlo,
+                         compat_size_t, len, int, advice)
  {
-       return ksys_fadvise64_64(fd, (offhi << 32) | offlo, len, advice);
 -      return sys_fadvise64_64(fd, ((u64)offhi << 32) | offlo, len, advice);
++      return ksys_fadvise64_64(fd, ((u64)offhi << 32) | offlo, len, advice);
  }
  
- long compat_sys_fadvise64_64(int fd,
-                            unsigned long offhi, unsigned long offlo,
-                            unsigned long lenhi, unsigned long lenlo,
-                            int advice)
+ COMPAT_SYSCALL_DEFINE6(fadvise64_64, int, fd, u32, offhi, u32, offlo,
+                            u32, lenhi, u32, lenlo, int, advice)
  {
 -      return sys_fadvise64_64(fd,
 -                              ((u64)offhi << 32) | offlo,
 -                              ((u64)lenhi << 32) | lenlo,
 -                              advice);
 +      return ksys_fadvise64_64(fd,
-                                (offhi << 32) | offlo,
-                                (lenhi << 32) | lenlo,
++                               ((u64)offhi << 32) | offlo,
++                               ((u64)lenhi << 32) | lenlo,
 +                               advice);
  }
  
- long sys32_sync_file_range(unsigned int fd, unsigned long off_high, unsigned long off_low, unsigned long nb_high, unsigned long nb_low, unsigned int flags)
+ COMPAT_SYSCALL_DEFINE6(sync_file_range, unsigned int, fd, u32, off_high, u32, off_low,
+                       u32, nb_high, u32, nb_low, unsigned int, flags)
  {
 -      return sys_sync_file_range(fd,
 -                                 ((u64)off_high << 32) | off_low,
 -                                 ((u64)nb_high << 32) | nb_low,
 -                                 flags);
 +      return ksys_sync_file_range(fd,
-                                  (off_high << 32) | off_low,
-                                  (nb_high << 32) | nb_low,
-                                  flags);
++                                  ((u64)off_high << 32) | off_low,
++                                  ((u64)nb_high << 32) | nb_low,
++                                  flags);
  }
  
- asmlinkage long compat_sys_fallocate(int fd, int mode, u32 offhi, u32 offlo,
-                                    u32 lenhi, u32 lenlo)
+ COMPAT_SYSCALL_DEFINE6(fallocate, int, fd, int, mode, u32, offhi, u32, offlo,
+                                    u32, lenhi, u32, lenlo)
  {
 -      return sys_fallocate(fd, mode, ((loff_t)offhi << 32) | offlo,
 -                           ((loff_t)lenhi << 32) | lenlo);
 +      return ksys_fallocate(fd, mode, ((loff_t)offhi << 32) | offlo,
 +                            ((loff_t)lenhi << 32) | lenlo);
  }

diff --cc arch/sparc/kernel/sys_sparc_32.c
index d980da4ffd7bfdb59bdb5d12c9b85849ebaaf1e5,a5df89743e06f9e03026505778711b70072833a9..e8c3cb6b6d08ccbfb04ccd09f55da90db70cfbea
--- 1/arch/sparc/kernel/sys_sparc_32.c
--- 2/arch/sparc/kernel/sys_sparc_32.c
+++ b/arch/sparc/kernel/sys_sparc_32.c
@@@ -104,21 -104,21 +104,21 @@@ SYSCALL_DEFINE6(mmap2, unsigned long, a
  {
        /* Make sure the shift for mmap2 is constant (12), no matter what PAGE_SIZE
           we have. */
 -      return sys_mmap_pgoff(addr, len, prot, flags, fd,
 -                            pgoff >> (PAGE_SHIFT - 12));
 +      return ksys_mmap_pgoff(addr, len, prot, flags, fd,
 +                             pgoff >> (PAGE_SHIFT - 12));
  }
  
- asmlinkage long sys_mmap(unsigned long addr, unsigned long len,
-       unsigned long prot, unsigned long flags, unsigned long fd,
-       unsigned long off)
+ SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len,
+       unsigned long, prot, unsigned long, flags, unsigned long, fd,
+       unsigned long, off)
  {
        /* no alignment check? */
 -      return sys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT);
 +      return ksys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT);
  }
  
- long sparc_remap_file_pages(unsigned long start, unsigned long size,
-                          unsigned long prot, unsigned long pgoff,
-                          unsigned long flags)
+ SYSCALL_DEFINE5(sparc_remap_file_pages, unsigned long, start, unsigned long, size,
+                          unsigned long, prot, unsigned long, pgoff,
+                          unsigned long, flags)
  {
        /* This works on an existing mmap so we don't need to validate
         * the range as that was done at the original mmap call.

diff --cc arch/sparc/kernel/sys_sparc_64.c
Simple merge