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

[sfrench/cifs-2.6.git] / arch / sparc / kernel / sys_sparc32.c

diff --git a/arch/sparc/kernel/sys_sparc32.c b/arch/sparc/kernel/sys_sparc32.c
index f166e5bbf506d4ba6e9e38f96210a22dfd53e0d0..b5da3bfdc2252d993b4e16f43c3d31d0f3b74617 100644 (file)
--- a/arch/sparc/kernel/sys_sparc32.c
+++ b/arch/sparc/kernel/sys_sparc32.c
@@ -52,20 +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 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 ksys_ftruncate(fd, ((u64)high << 32) | low);
 }
 
 static int cp_compat_stat64(struct kstat *stat,
@@ -98,8 +92,8 @@ static int cp_compat_stat64(struct kstat *stat,
        return err;
 }
 
-asmlinkage long compat_sys_stat64(const char __user * filename,
-               struct compat_stat64 __user *statbuf)
+COMPAT_SYSCALL_DEFINE2(stat64, const char __user *, filename,
+               struct compat_stat64 __user *, statbuf)
 {
        struct kstat stat;
        int error = vfs_stat(filename, &stat);
@@ -109,8 +103,8 @@ asmlinkage long compat_sys_stat64(const char __user * filename,
        return error;
 }
 
-asmlinkage long compat_sys_lstat64(const char __user * filename,
-               struct compat_stat64 __user *statbuf)
+COMPAT_SYSCALL_DEFINE2(lstat64, const char __user *, filename,
+               struct compat_stat64 __user *, statbuf)
 {
        struct kstat stat;
        int error = vfs_lstat(filename, &stat);
@@ -120,8 +114,8 @@ asmlinkage long compat_sys_lstat64(const char __user * filename,
        return error;
 }
 
-asmlinkage long compat_sys_fstat64(unsigned int fd,
-               struct compat_stat64 __user * statbuf)
+COMPAT_SYSCALL_DEFINE2(fstat64, unsigned int, fd,
+               struct compat_stat64 __user *, statbuf)
 {
        struct kstat stat;
        int error = vfs_fstat(fd, &stat);
@@ -131,9 +125,9 @@ asmlinkage long compat_sys_fstat64(unsigned int fd,
        return error;
 }
 
-asmlinkage long compat_sys_fstatat64(unsigned int dfd,
-               const char __user *filename,
-               struct compat_stat64 __user * statbuf, int flag)
+COMPAT_SYSCALL_DEFINE4(fstatat64, unsigned int, dfd,
+               const char __user *, filename,
+               struct compat_stat64 __user *, statbuf, int, flag)
 {
        struct kstat stat;
        int error;
@@ -194,61 +188,50 @@ COMPAT_SYSCALL_DEFINE5(rt_sigaction, int, sig,
         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 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 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 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 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 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 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 ksys_fallocate(fd, mode, ((loff_t)offhi << 32) | offlo,
                              ((loff_t)lenhi << 32) | lenlo);