Commit 8c82ccd6 authored by Al Viro's avatar Al Viro
Browse files

sparc: switch compat pread64 and pwrite64 to COMPAT_SYSCALL_DEFINE 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 8ccb0046

arch/sparc/kernel/sys_sparc32.c

+6 −12
Original line number Original line Diff line number Diff line
@@ -194,22 +194,16 @@ COMPAT_SYSCALL_DEFINE5(rt_sigaction, int, sig, 
        return ret;

        return ret;

}

}





asmlinkage compat_ssize_t sys32_pread64(unsigned int fd,

COMPAT_SYSCALL_DEFINE5(pread64, unsigned int, fd, char __user *, ubuf,

					char __user *ubuf,

			compat_size_t, count, u32, poshi, u32, poslo)

					compat_size_t count,

					unsigned long poshi,

					unsigned long poslo)

{

{

	return sys_pread64(fd, ubuf, count, (poshi << 32) | poslo);

	return sys_pread64(fd, ubuf, count, ((u64)poshi << 32) | poslo);

}

}





asmlinkage compat_ssize_t sys32_pwrite64(unsigned int fd,

COMPAT_SYSCALL_DEFINE5(pwrite64, unsigned int, fd, char __user *, ubuf,

					 char __user *ubuf,

			compat_size_t, count, u32, poshi, u32, poslo)

					 compat_size_t count,

					 unsigned long poshi,

					 unsigned long poslo)

{

{

	return sys_pwrite64(fd, ubuf, count, (poshi << 32) | poslo);

	return sys_pwrite64(fd, ubuf, count, ((u64)poshi << 32) | poslo);

}

}





COMPAT_SYSCALL_DEFINE4(readahead, int, fd, u32, offhi, u32, offlo,

COMPAT_SYSCALL_DEFINE4(readahead, int, fd, u32, offhi, u32, offlo,

arch/sparc/kernel/systbls.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -65,16 +65,16 @@ asmlinkage long compat_sys_fstat64(unsigned int fd, 
asmlinkage long compat_sys_fstatat64(unsigned int dfd,

asmlinkage long compat_sys_fstatat64(unsigned int dfd,

				     const char __user *filename,

				     const char __user *filename,

				     struct compat_stat64 __user * statbuf, int flag);

				     struct compat_stat64 __user * statbuf, int flag);

asmlinkage compat_ssize_t sys32_pread64(unsigned int fd,

asmlinkage long compat_sys_pread64(unsigned int fd,

					char __user *ubuf,

					char __user *ubuf,

					compat_size_t count,

					compat_size_t count,

					unsigned long poshi,

					u32 poshi,

					unsigned long poslo);

					u32 poslo);

asmlinkage compat_ssize_t sys32_pwrite64(unsigned int fd,

asmlinkage long compat_sys_pwrite64(unsigned int fd,

					 char __user *ubuf,

					 char __user *ubuf,

					 compat_size_t count,

					 compat_size_t count,

					 unsigned long poshi,

					 u32 poshi,

					 unsigned long poslo);

					 u32 poslo);

asmlinkage long compat_sys_readahead(int fd,

asmlinkage long compat_sys_readahead(int fd,

				     unsigned offhi,

				     unsigned offhi,

				     unsigned offlo,

				     unsigned offlo,

arch/sparc/kernel/systbls_64.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ sys_call_table32: 
/*50*/	.word sys_getegid16, sys_acct, sys_nis_syscall, sys_getgid, compat_sys_ioctl

/*50*/	.word sys_getegid16, sys_acct, sys_nis_syscall, sys_getgid, compat_sys_ioctl

	.word sys_reboot, sys32_mmap2, sys_symlink, sys_readlink, sys32_execve

	.word sys_reboot, sys32_mmap2, sys_symlink, sys_readlink, sys32_execve

/*60*/	.word sys_umask, sys_chroot, compat_sys_newfstat, compat_sys_fstat64, sys_getpagesize

/*60*/	.word sys_umask, sys_chroot, compat_sys_newfstat, compat_sys_fstat64, sys_getpagesize

	.word sys_msync, sys_vfork, sys32_pread64, sys32_pwrite64, sys_geteuid

	.word sys_msync, sys_vfork, compat_sys_pread64, compat_sys_pwrite64, sys_geteuid

/*70*/	.word sys_getegid, sys_mmap, sys_setreuid, sys_munmap, sys_mprotect

/*70*/	.word sys_getegid, sys_mmap, sys_setreuid, sys_munmap, sys_mprotect

	.word sys_madvise, sys_vhangup, sys32_truncate64, sys_mincore, sys_getgroups16

	.word sys_madvise, sys_vhangup, sys32_truncate64, sys_mincore, sys_getgroups16

/*80*/	.word sys_setgroups16, sys_getpgrp, sys_setgroups, compat_sys_setitimer, sys32_ftruncate64

/*80*/	.word sys_setgroups16, sys_getpgrp, sys_setgroups, compat_sys_setitimer, sys32_ftruncate64