Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55bb5a1e authored by Al Viro's avatar Al Viro
Browse files

sparc: switch to generic compat rt_sigpending() 



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

arch/sparc/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,7 @@ config SPARC 
	select ODD_RT_SIGACTION

	select ODD_RT_SIGACTION

	select GENERIC_SIGALTSTACK

	select GENERIC_SIGALTSTACK

	select GENERIC_COMPAT_RT_SIGPROCMASK

	select GENERIC_COMPAT_RT_SIGPROCMASK

	select GENERIC_COMPAT_RT_SIGPENDING





config SPARC32

config SPARC32

	def_bool !64BIT

	def_bool !64BIT

arch/sparc/kernel/sys_sparc32.c

+0 −24
Original line number Original line Diff line number Diff line
@@ -211,30 +211,6 @@ asmlinkage long compat_sys_sysfs(int option, u32 arg1, u32 arg2) 
	return sys_sysfs(option, arg1, arg2);

	return sys_sysfs(option, arg1, arg2);

}

}





asmlinkage long sys32_rt_sigpending(compat_sigset_t __user *set,

				    compat_size_t sigsetsize)

{

	sigset_t s;

	compat_sigset_t s32;

	int ret;

	mm_segment_t old_fs = get_fs();

		

	set_fs (KERNEL_DS);

	ret = sys_rt_sigpending((sigset_t __user *) &s, sigsetsize);

	set_fs (old_fs);

	if (!ret) {

		switch (_NSIG_WORDS) {

		case 4: s32.sig[7] = (s.sig[3] >> 32); s32.sig[6] = s.sig[3];

		case 3: s32.sig[5] = (s.sig[2] >> 32); s32.sig[4] = s.sig[2];

		case 2: s32.sig[3] = (s.sig[1] >> 32); s32.sig[2] = s.sig[1];

		case 1: s32.sig[1] = (s.sig[0] >> 32); s32.sig[0] = s.sig[0];

		}

		if (copy_to_user (set, &s32, sizeof(compat_sigset_t)))

			return -EFAULT;

	}

	return ret;

}



asmlinkage long compat_sys_rt_sigqueueinfo(int pid, int sig,

asmlinkage long compat_sys_rt_sigqueueinfo(int pid, int sig,

					   struct compat_siginfo __user *uinfo)

					   struct compat_siginfo __user *uinfo)

{

{

arch/sparc/kernel/systbls_64.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ sys_call_table32: 
	.word sys32_swapon, sys32_getitimer, sys_setuid, sys32_sethostname, sys_setgid

	.word sys32_swapon, sys32_getitimer, sys_setuid, sys32_sethostname, sys_setgid

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

/*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

	.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, sys32_rt_sigpending

/*100*/ .word sys32_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

	.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

/*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 sys32_getgroups, compat_sys_gettimeofday, sys32_getrusage, sys_nis_syscall, sys_getcwd