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

Commit 7b83d1a2 authored by Al Viro's avatar Al Viro
Browse files

x86: switch to generic compat rt_sigqueueinfo() 



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

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ config X86 
	select MODULES_USE_ELF_RELA if X86_64

	select CLONE_BACKWARDS if X86_32

	select GENERIC_SIGALTSTACK

	select GENERIC_COMPAT_RT_SIGQUEUEINFO

	select GENERIC_COMPAT_RT_SIGPENDING



config INSTRUCTION_DECODER

arch/x86/ia32/sys_ia32.c

+0 −15
Original line number Diff line number Diff line
@@ -310,21 +310,6 @@ asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid, 
	return ret;

}



asmlinkage long sys32_rt_sigqueueinfo(int pid, int sig,

				      compat_siginfo_t __user *uinfo)

{

	siginfo_t info;

	int ret;

	mm_segment_t old_fs = get_fs();



	if (copy_siginfo_from_user32(&info, uinfo))

		return -EFAULT;

	set_fs(KERNEL_DS);

	ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __user *)&info);

	set_fs(old_fs);

	return ret;

}



/* warning: next two assume little endian */

asmlinkage long sys32_pread(unsigned int fd, char __user *ubuf, u32 count,

			    u32 poslo, u32 poshi)

arch/x86/include/asm/sys_ia32.h

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ asmlinkage long sys32_sysfs(int, u32, u32); 


asmlinkage long sys32_sched_rr_get_interval(compat_pid_t,

					    struct compat_timespec __user *);

asmlinkage long sys32_rt_sigqueueinfo(int, int, compat_siginfo_t __user *);



asmlinkage long sys32_pread(unsigned int, char __user *, u32, u32, u32);

asmlinkage long sys32_pwrite(unsigned int, const char __user *, u32, u32, u32);

arch/x86/syscalls/syscall_32.tbl

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ 
175	i386	rt_sigprocmask		sys_rt_sigprocmask

176	i386	rt_sigpending		sys_rt_sigpending		compat_sys_rt_sigpending

177	i386	rt_sigtimedwait		sys_rt_sigtimedwait		compat_sys_rt_sigtimedwait

178	i386	rt_sigqueueinfo		sys_rt_sigqueueinfo		sys32_rt_sigqueueinfo

178	i386	rt_sigqueueinfo		sys_rt_sigqueueinfo		compat_sys_rt_sigqueueinfo

179	i386	rt_sigsuspend		sys_rt_sigsuspend

180	i386	pread64			sys_pread64			sys32_pread

181	i386	pwrite64		sys_pwrite64			sys32_pwrite

arch/x86/syscalls/syscall_64.tbl

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ 
521	x32	ptrace			compat_sys_ptrace

522	x32	rt_sigpending		compat_sys_rt_sigpending

523	x32	rt_sigtimedwait		compat_sys_rt_sigtimedwait

524	x32	rt_sigqueueinfo		sys32_rt_sigqueueinfo

524	x32	rt_sigqueueinfo		compat_sys_rt_sigqueueinfo

525	x32	sigaltstack		compat_sys_sigaltstack

526	x32	timer_create		compat_sys_timer_create

527	x32	mq_notify		compat_sys_mq_notify