sparc: trivial conversions to {COMPAT_,}SYSCALL_DEFINE() (ee076e81) · Commits · e / devices / android_kernel_fairphone_FP4

arch/sparc/kernel/sys_sparc32.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -98,8 +98,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 +109,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 +120,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 +131,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;
		@@ -241,8 +241,8 @@ long sys32_sync_file_range(unsigned int fd, unsigned long off_high, unsigned lon
		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);

arch/sparc/kernel/sys_sparc_32.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@
		/* XXX Make this per-binary type, this way we can detect the type of
		* XXX a binary. Every Sparc executable calls this very early on.
		*/
		asmlinkage unsigned long sys_getpagesize(void)
		SYSCALL_DEFINE0(getpagesize)
		{
		return PAGE_SIZE; /* Possibly older binaries want 8192 on sun4's? */
		}
		@@ -98,9 +98,9 @@ int sparc_mmap_check(unsigned long addr, unsigned long len)

		/* Linux version of mmap */

		asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
		unsigned long prot, unsigned long flags, unsigned long fd,
		unsigned long pgoff)
		SYSCALL_DEFINE6(mmap2, unsigned long, addr, unsigned long, len,
		unsigned long, prot, unsigned long, flags, unsigned long, fd,
		unsigned long, pgoff)
		{
		/* Make sure the shift for mmap2 is constant (12), no matter what PAGE_SIZE
		we have. */
		@@ -108,9 +108,9 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
		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);
		@@ -202,7 +202,7 @@ SYSCALL_DEFINE5(rt_sigaction, int, sig,
		return ret;
		}

		asmlinkage long sys_getdomainname(char __user *name, int len)
		SYSCALL_DEFINE2(getdomainname, char __user *, name, int, len)
		{
		int nlen, err;

arch/sparc/kernel/sys_sparc_64.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@

		/* #define DEBUG_UNIMP_SYSCALL */

		asmlinkage unsigned long sys_getpagesize(void)
		SYSCALL_DEFINE0(getpagesize)
		{
		return PAGE_SIZE;
		}
		@@ -642,7 +642,7 @@ SYSCALL_DEFINE5(rt_sigaction, int, sig, const struct sigaction __user *, act,
		return ret;
		}

		asmlinkage long sys_kern_features(void)
		SYSCALL_DEFINE0(kern_features)
		{
		return KERN_FEATURE_MIXED_MODE_STACK;
		}

arch/sparc/kernel/systbls.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@

		#include <asm/utrap.h>

		asmlinkage unsigned long sys_getpagesize(void);
		asmlinkage long sys_getpagesize(void);
		asmlinkage long sys_sparc_pipe(void);
		asmlinkage unsigned long c_sys_nis_syscall(struct pt_regs *regs);
		asmlinkage long sys_getdomainname(char __user *name, int len);