Commit 5250a8bb authored by Al Viro's avatar Al Viro
Browse files

sparc: kill sign-extending wrappers for native syscalls 



SYSCALL_DEFINE-added wrapper will take care of those just fine;
no extra compat wrappers needed.

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

arch/sparc/kernel/sys32.S

+0 −76
Original line number Diff line number Diff line
@@ -36,108 +36,32 @@ STUB: sra REG1, 0, REG1; \ 
	jmpl	%g1 + %lo(SYSCALL), %g0; \

	sra	REG3, 0, REG3



#define SIGN4(STUB,SYSCALL,REG1,REG2,REG3,REG4) \

	.align	32; \

	.globl	STUB; \

STUB:	sra	REG1, 0, REG1; \

	sethi	%hi(SYSCALL), %g1; \

	sra	REG2, 0, REG2; \

	sra	REG3, 0, REG3; \

	jmpl	%g1 + %lo(SYSCALL), %g0; \

	sra	REG4, 0, REG4



SIGN1(sys32_exit, sparc_exit, %o0)

SIGN1(sys32_exit_group, sparc_exit_group, %o0)

SIGN1(sys32_wait4, compat_sys_wait4, %o2)

SIGN1(sys32_creat, sys_creat, %o1)

SIGN1(sys32_mknod, sys_mknod, %o1)

SIGN1(sys32_umount, sys_umount, %o1)

SIGN1(sys32_signal, sys_signal, %o0)

SIGN1(sys32_access, sys_access, %o1)

SIGN1(sys32_msync, sys_msync, %o2)

SIGN2(sys32_reboot, sys_reboot, %o0, %o1)

SIGN1(sys32_setitimer, compat_sys_setitimer, %o0)

SIGN1(sys32_getitimer, compat_sys_getitimer, %o0)

SIGN1(sys32_sethostname, sys_sethostname, %o1)

SIGN1(sys32_swapon, sys_swapon, %o1)

SIGN1(sys32_sigaction, compat_sys_sparc_sigaction, %o0)

SIGN1(sys32_rt_sigaction, compat_sys_rt_sigaction, %o0)

SIGN1(sys32_sigprocmask, compat_sys_sigprocmask, %o0)

SIGN1(sys32_rt_sigprocmask, compat_sys_rt_sigprocmask, %o0)

SIGN2(sys32_rt_sigqueueinfo, compat_sys_rt_sigqueueinfo, %o0, %o1)

SIGN1(sys32_getrusage, compat_sys_getrusage, %o0)

SIGN1(sys32_setxattr, sys_setxattr, %o4)

SIGN1(sys32_lsetxattr, sys_lsetxattr, %o4)

SIGN1(sys32_fsetxattr, sys_fsetxattr, %o4)

SIGN1(sys32_fgetxattr, sys_fgetxattr, %o0)

SIGN1(sys32_flistxattr, sys_flistxattr, %o0)

SIGN1(sys32_fremovexattr, sys_fremovexattr, %o0)

SIGN2(sys32_tkill, sys_tkill, %o0, %o1)

SIGN1(sys32_epoll_create, sys_epoll_create, %o0)

SIGN3(sys32_epoll_ctl, sys_epoll_ctl, %o0, %o1, %o2)

SIGN3(sys32_epoll_wait, sys_epoll_wait, %o0, %o2, %o3)

SIGN1(sys32_readahead, compat_sys_readahead, %o0)

SIGN2(sys32_fadvise64, compat_sys_fadvise64, %o0, %o4)

SIGN2(sys32_fadvise64_64, compat_sys_fadvise64_64, %o0, %o5)

SIGN2(sys32_bdflush, sys_bdflush, %o0, %o1)

SIGN1(sys32_mlockall, sys_mlockall, %o0)

SIGN1(sys32_clock_nanosleep, compat_sys_clock_nanosleep, %o1)

SIGN1(sys32_timer_settime, compat_sys_timer_settime, %o1)

SIGN1(sys32_io_submit, compat_sys_io_submit, %o1)

SIGN1(sys32_mq_open, compat_sys_mq_open, %o1)

SIGN1(sys32_select, compat_sys_select, %o0)

SIGN1(sys32_mkdir, sys_mkdir, %o1)

SIGN3(sys32_futex, compat_sys_futex, %o1, %o2, %o5)

SIGN1(sys32_sysfs, compat_sys_sysfs, %o0)

SIGN2(sys32_sendfile, compat_sys_sendfile, %o0, %o1)

SIGN2(sys32_sendfile64, sys_sendfile, %o0, %o1)

SIGN1(sys32_prctl, sys_prctl, %o0)

SIGN1(sys32_sched_rr_get_interval, compat_sys_sched_rr_get_interval, %o0)

SIGN2(sys32_waitpid, sys_waitpid, %o0, %o2)

SIGN1(sys32_getgroups, sys_getgroups, %o0)

SIGN1(sys32_getpgid, sys_getpgid, %o0)

SIGN2(sys32_getpriority, sys_getpriority, %o0, %o1)

SIGN1(sys32_getsid, sys_getsid, %o0)

SIGN2(sys32_kill, sys_kill, %o0, %o1)

SIGN1(sys32_nice, sys_nice, %o0)

SIGN1(sys32_lseek, sys_lseek, %o1)

SIGN2(sys32_open, compat_sys_open, %o1, %o2)

SIGN1(sys32_readlink, sys_readlink, %o2)

SIGN1(sys32_sched_get_priority_max, sys_sched_get_priority_max, %o0)

SIGN1(sys32_sched_get_priority_min, sys_sched_get_priority_min, %o0)

SIGN1(sys32_sched_getparam, sys_sched_getparam, %o0)

SIGN1(sys32_sched_getscheduler, sys_sched_getscheduler, %o0)

SIGN1(sys32_sched_setparam, sys_sched_setparam, %o0)

SIGN2(sys32_sched_setscheduler, sys_sched_setscheduler, %o0, %o1)

SIGN1(sys32_getdomainname, sys_getdomainname, %o1)

SIGN1(sys32_setdomainname, sys_setdomainname, %o1)

SIGN1(sys32_setgroups, sys_setgroups, %o0)

SIGN2(sys32_setpgid, sys_setpgid, %o0, %o1)

SIGN3(sys32_setpriority, sys_setpriority, %o0, %o1, %o2)

SIGN1(sys32_ssetmask, sys_ssetmask, %o0)

SIGN2(sys32_syslog, sys_syslog, %o0, %o2)

SIGN1(sys32_umask, sys_umask, %o0)

SIGN3(sys32_tgkill, sys_tgkill, %o0, %o1, %o2)

SIGN1(sys32_sendto, sys_sendto, %o0)

SIGN1(sys32_recvfrom, compat_sys_recvfrom, %o0)

SIGN3(sys32_socket, sys_socket, %o0, %o1, %o2)

SIGN2(sys32_connect, sys_connect, %o0, %o2)

SIGN2(sys32_bind, sys_bind, %o0, %o2)

SIGN2(sys32_listen, sys_listen, %o0, %o1)

SIGN1(sys32_recvmsg, compat_sys_recvmsg, %o0)

SIGN1(sys32_sendmsg, compat_sys_sendmsg, %o0)

SIGN2(sys32_shutdown, sys_shutdown, %o0, %o1)

SIGN3(sys32_socketpair, sys_socketpair, %o0, %o1, %o2)

SIGN1(sys32_getpeername, sys_getpeername, %o0)

SIGN1(sys32_getsockname, sys_getsockname, %o0)

SIGN2(sys32_ioprio_get, sys_ioprio_get, %o0, %o1)

SIGN3(sys32_ioprio_set, sys_ioprio_set, %o0, %o1, %o2)

SIGN2(sys32_splice, sys_splice, %o0, %o2)

SIGN2(sys32_sync_file_range, compat_sync_file_range, %o0, %o5)

SIGN2(sys32_tee, sys_tee, %o0, %o1)

SIGN1(sys32_vmsplice, compat_sys_vmsplice, %o0)

SIGN1(sys32_truncate, sys_truncate, %o1)

SIGN1(sys32_ftruncate, sys_ftruncate, %o1)



	.globl		sys32_mmap2

sys32_mmap2:

arch/sparc/kernel/sys_sparc32.c

+0 −34
Original line number Diff line number Diff line
@@ -206,11 +206,6 @@ asmlinkage long compat_sys_fstatat64(unsigned int dfd, 
	return cp_compat_stat64(&stat, statbuf);

}



asmlinkage long compat_sys_sysfs(int option, u32 arg1, u32 arg2)

{

	return sys_sysfs(option, arg1, arg2);

}



COMPAT_SYSCALL_DEFINE3(sparc_sigaction, int, sig,

			struct compat_old_sigaction __user *,act,

			struct compat_old_sigaction __user *,oact)
@@ -263,35 +258,6 @@ COMPAT_SYSCALL_DEFINE5(rt_sigaction, int, sig, 
        return ret;

}



#ifdef CONFIG_MODULES



asmlinkage long sys32_init_module(void __user *umod, u32 len,

				  const char __user *uargs)

{

	return sys_init_module(umod, len, uargs);

}



asmlinkage long sys32_delete_module(const char __user *name_user,

				    unsigned int flags)

{

	return sys_delete_module(name_user, flags);

}



#else /* CONFIG_MODULES */



asmlinkage long sys32_init_module(const char __user *name_user,

				  struct module __user *mod_user)

{

	return -ENOSYS;

}



asmlinkage long sys32_delete_module(const char __user *name_user)

{

	return -ENOSYS;

}



#endif  /* CONFIG_MODULES */



asmlinkage compat_ssize_t sys32_pread64(unsigned int fd,

					char __user *ubuf,

					compat_size_t count,

arch/sparc/kernel/systbls_64.S

+40 −40
Original line number Diff line number Diff line
@@ -18,63 +18,63 @@ 


	.globl sys_call_table32

sys_call_table32:

/*0*/	.word sys_restart_syscall, sys32_exit, sys_fork, sys_read, sys_write

/*5*/	.word sys32_open, sys_close, sys32_wait4, sys32_creat, sys_link

/*10*/  .word sys_unlink, sunos_execv, sys_chdir, sys_chown16, sys32_mknod

/*15*/	.word sys_chmod, sys_lchown16, sys_brk, sys_nis_syscall, sys32_lseek

/*0*/	.word sys_restart_syscall, sparc_exit, sys_fork, sys_read, sys_write

/*5*/	.word sys32_open, sys_close, sys32_wait4, sys_creat, sys_link

/*10*/  .word sys_unlink, sunos_execv, sys_chdir, sys_chown16, sys_mknod

/*15*/	.word sys_chmod, sys_lchown16, sys_brk, sys_nis_syscall, sys_lseek

/*20*/	.word sys_getpid, sys_capget, sys_capset, sys_setuid16, sys_getuid16

/*25*/	.word sys32_vmsplice, compat_sys_ptrace, sys_alarm, compat_sys_sigaltstack, sys_pause

/*30*/	.word compat_sys_utime, sys_lchown, sys_fchown, sys32_access, sys32_nice

	.word sys_chown, sys_sync, sys32_kill, compat_sys_newstat, sys32_sendfile

/*30*/	.word compat_sys_utime, sys_lchown, sys_fchown, sys_access, sys_nice

	.word sys_chown, sys_sync, sys_kill, compat_sys_newstat, sys32_sendfile

/*40*/	.word compat_sys_newlstat, sys_dup, sys_sparc_pipe, compat_sys_times, sys_getuid

	.word sys32_umount, sys_setgid16, sys_getgid16, sys32_signal, sys_geteuid16

	.word sys_umount, sys_setgid16, sys_getgid16, sys_signal, sys_geteuid16

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

	.word sys32_reboot, sys32_mmap2, sys_symlink, sys32_readlink, sys32_execve

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

	.word sys32_msync, sys_vfork, sys32_pread64, sys32_pwrite64, sys_geteuid

	.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

	.word sys_msync, sys_vfork, sys32_pread64, sys32_pwrite64, sys_geteuid

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

	.word sys_madvise, sys_vhangup, sys32_truncate64, sys_mincore, sys_getgroups16

/*80*/	.word sys_setgroups16, sys_getpgrp, sys32_setgroups, sys32_setitimer, sys32_ftruncate64

	.word sys32_swapon, sys32_getitimer, sys_setuid, sys32_sethostname, sys_setgid

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

	.word sys_swapon, sys32_getitimer, sys_setuid, sys_sethostname, sys_setgid

/*90*/	.word sys_dup2, sys_setfsuid, compat_sys_fcntl, sys32_select, sys_setfsgid

	.word sys_fsync, sys32_setpriority, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall

/*100*/ .word sys32_getpriority, sys32_rt_sigreturn, sys32_rt_sigaction, sys32_rt_sigprocmask, compat_sys_rt_sigpending

	.word sys_fsync, sys_setpriority, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall

/*100*/ .word sys_getpriority, sys32_rt_sigreturn, sys32_rt_sigaction, sys32_rt_sigprocmask, compat_sys_rt_sigpending

	.word compat_sys_rt_sigtimedwait, sys32_rt_sigqueueinfo, compat_sys_rt_sigsuspend, sys_setresuid, sys_getresuid

/*110*/	.word sys_setresgid, sys_getresgid, sys_setregid, sys_nis_syscall, sys_nis_syscall

	.word sys32_getgroups, compat_sys_gettimeofday, sys32_getrusage, sys_nis_syscall, sys_getcwd

	.word sys_getgroups, compat_sys_gettimeofday, sys32_getrusage, sys_nis_syscall, sys_getcwd

/*120*/	.word compat_sys_readv, compat_sys_writev, compat_sys_settimeofday, sys_fchown16, sys_fchmod

	.word sys_nis_syscall, sys_setreuid16, sys_setregid16, sys_rename, sys32_truncate

/*130*/	.word sys32_ftruncate, sys_flock, compat_sys_lstat64, sys_nis_syscall, sys_nis_syscall

	.word sys_nis_syscall, sys32_mkdir, sys_rmdir, compat_sys_utimes, compat_sys_stat64

/*140*/	.word sys32_sendfile64, sys_nis_syscall, sys32_futex, sys_gettid, compat_sys_getrlimit

	.word compat_sys_setrlimit, sys_pivot_root, sys32_prctl, sys_pciconfig_read, sys_pciconfig_write

	.word sys_nis_syscall, sys_setreuid16, sys_setregid16, sys_rename, sys_truncate

/*130*/	.word sys_ftruncate, sys_flock, compat_sys_lstat64, sys_nis_syscall, sys_nis_syscall

	.word sys_nis_syscall, sys_mkdir, sys_rmdir, compat_sys_utimes, compat_sys_stat64

/*140*/	.word sys_sendfile64, sys_nis_syscall, sys32_futex, sys_gettid, compat_sys_getrlimit

	.word compat_sys_setrlimit, sys_pivot_root, sys_prctl, sys_pciconfig_read, sys_pciconfig_write

/*150*/	.word sys_nis_syscall, sys_inotify_init, sys_inotify_add_watch, sys_poll, sys_getdents64

	.word compat_sys_fcntl64, sys_inotify_rm_watch, compat_sys_statfs, compat_sys_fstatfs, sys_oldumount

/*160*/	.word compat_sys_sched_setaffinity, compat_sys_sched_getaffinity, sys32_getdomainname, sys32_setdomainname, sys_nis_syscall

	.word sys_quotactl, sys_set_tid_address, compat_sys_mount, compat_sys_ustat, sys32_setxattr

/*170*/	.word sys32_lsetxattr, sys32_fsetxattr, sys_getxattr, sys_lgetxattr, compat_sys_getdents

	.word sys_setsid, sys_fchdir, sys32_fgetxattr, sys_listxattr, sys_llistxattr

/*180*/	.word sys32_flistxattr, sys_removexattr, sys_lremovexattr, compat_sys_sigpending, sys_ni_syscall

	.word sys32_setpgid, sys32_fremovexattr, sys32_tkill, sys32_exit_group, sys_newuname

/*190*/	.word sys32_init_module, sys_sparc64_personality, sys_remap_file_pages, sys32_epoll_create, sys32_epoll_ctl

	.word sys32_epoll_wait, sys32_ioprio_set, sys_getppid, sys32_sigaction, sys_sgetmask

/*200*/	.word sys32_ssetmask, sys_sigsuspend, compat_sys_newlstat, sys_uselib, compat_sys_old_readdir

	.word sys32_readahead, sys32_socketcall, sys32_syslog, sys32_lookup_dcookie, sys32_fadvise64

/*210*/	.word sys32_fadvise64_64, sys32_tgkill, sys32_waitpid, sys_swapoff, compat_sys_sysinfo

	.word compat_sys_ipc, sys32_sigreturn, sys_clone, sys32_ioprio_get, compat_sys_adjtimex

/*220*/	.word sys32_sigprocmask, sys_ni_syscall, sys32_delete_module, sys_ni_syscall, sys32_getpgid

	.word sys32_bdflush, sys32_sysfs, sys_nis_syscall, sys_setfsuid16, sys_setfsgid16

/*230*/	.word sys32_select, compat_sys_time, sys32_splice, compat_sys_stime, compat_sys_statfs64

	.word compat_sys_fstatfs64, sys_llseek, sys_mlock, sys_munlock, sys32_mlockall

/*240*/	.word sys_munlockall, sys32_sched_setparam, sys32_sched_getparam, sys32_sched_setscheduler, sys32_sched_getscheduler

	.word sys_sched_yield, sys32_sched_get_priority_max, sys32_sched_get_priority_min, sys32_sched_rr_get_interval, compat_sys_nanosleep

/*250*/	.word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys_nis_syscall

/*160*/	.word compat_sys_sched_setaffinity, compat_sys_sched_getaffinity, sys_getdomainname, sys_setdomainname, sys_nis_syscall

	.word sys_quotactl, sys_set_tid_address, compat_sys_mount, compat_sys_ustat, sys_setxattr

/*170*/	.word sys_lsetxattr, sys_fsetxattr, sys_getxattr, sys_lgetxattr, compat_sys_getdents

	.word sys_setsid, sys_fchdir, sys_fgetxattr, sys_listxattr, sys_llistxattr

/*180*/	.word sys_flistxattr, sys_removexattr, sys_lremovexattr, compat_sys_sigpending, sys_ni_syscall

	.word sys_setpgid, sys_fremovexattr, sys_tkill, sparc_exit_group, sys_newuname

/*190*/	.word sys_init_module, sys_sparc64_personality, sys_remap_file_pages, sys_epoll_create, sys_epoll_ctl

	.word sys_epoll_wait, sys_ioprio_set, sys_getppid, sys32_sigaction, sys_sgetmask

/*200*/	.word sys_ssetmask, sys_sigsuspend, compat_sys_newlstat, sys_uselib, compat_sys_old_readdir

	.word sys32_readahead, sys32_socketcall, sys_syslog, sys32_lookup_dcookie, sys32_fadvise64

/*210*/	.word sys32_fadvise64_64, sys_tgkill, sys_waitpid, sys_swapoff, compat_sys_sysinfo

	.word compat_sys_ipc, sys32_sigreturn, sys_clone, sys_ioprio_get, compat_sys_adjtimex

/*220*/	.word sys32_sigprocmask, sys_ni_syscall, sys_delete_module, sys_ni_syscall, sys_getpgid

	.word sys_bdflush, sys_sysfs, sys_nis_syscall, sys_setfsuid16, sys_setfsgid16

/*230*/	.word sys32_select, compat_sys_time, sys_splice, compat_sys_stime, compat_sys_statfs64

	.word compat_sys_fstatfs64, sys_llseek, sys_mlock, sys_munlock, sys_mlockall

/*240*/	.word sys_munlockall, sys_sched_setparam, sys_sched_getparam, sys_sched_setscheduler, sys_sched_getscheduler

	.word sys_sched_yield, sys_sched_get_priority_max, sys_sched_get_priority_min, sys32_sched_rr_get_interval, compat_sys_nanosleep

/*250*/	.word sys_mremap, compat_sys_sysctl, sys_getsid, sys_fdatasync, sys_nis_syscall

	.word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep

/*260*/	.word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun

	.word sys_timer_delete, compat_sys_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy

/*270*/	.word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink

	.word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid

/*280*/	.word sys32_tee, sys_add_key, sys_request_key, compat_sys_keyctl, compat_sys_openat

/*280*/	.word sys_tee, sys_add_key, sys_request_key, compat_sys_keyctl, compat_sys_openat

	.word sys_mkdirat, sys_mknodat, sys_fchownat, compat_sys_futimesat, compat_sys_fstatat64

/*290*/	.word sys_unlinkat, sys_renameat, sys_linkat, sys_symlinkat, sys_readlinkat

	.word sys_fchmodat, sys_faccessat, compat_sys_pselect6, compat_sys_ppoll, sys_unshare