Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

x86,um: switch to generic old sigsuspend()

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2012-12-25 16:09:20 -05:00
parent 7b83d1a297
commit 15ce1f7154
8 changed files with 3 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/um/kernel/signal.c
View file

@ -122,13 +122,3 @@ int do_signal(void)
{ {
return kern_do_signal(&current->thread.regs); return kern_do_signal(&current->thread.regs);
} }
/*
* Atomically swap in the new signal mask, and wait for a signal.
*/
long sys_sigsuspend(int history0, int history1, old_sigset_t mask)
{
sigset_t blocked;
siginitset(&blocked, mask);
return sigsuspend(&blocked);
}

1
arch/x86/Kconfig
View file

@ -116,6 +116,7 @@ config X86
select GENERIC_SIGALTSTACK select GENERIC_SIGALTSTACK
select GENERIC_COMPAT_RT_SIGQUEUEINFO select GENERIC_COMPAT_RT_SIGQUEUEINFO
select GENERIC_COMPAT_RT_SIGPENDING select GENERIC_COMPAT_RT_SIGPENDING
select OLD_SIGSUSPEND3 if X86_32 || IA32_EMULATION
config INSTRUCTION_DECODER config INSTRUCTION_DECODER
def_bool y def_bool y

7
arch/x86/ia32/ia32_signal.c
View file

@ -129,13 +129,6 @@ int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from)
return err; return err;
} }
asmlinkage long sys32_sigsuspend(int history0, int history1, old_sigset_t mask)
{
sigset_t blocked;
siginitset(&blocked, mask);
return sigsuspend(&blocked);
}
/* /*
* Do a signal return; undo the signal stack. * Do a signal return; undo the signal stack.
*/ */

1
arch/x86/include/asm/sys_ia32.h
View file

@ -66,7 +66,6 @@ asmlinkage long sys32_fallocate(int, int, unsigned,
unsigned, unsigned, unsigned); unsigned, unsigned, unsigned);
/* ia32/ia32_signal.c */ /* ia32/ia32_signal.c */
asmlinkage long sys32_sigsuspend(int, int, old_sigset_t);
asmlinkage long sys32_sigreturn(void); asmlinkage long sys32_sigreturn(void);
asmlinkage long sys32_rt_sigreturn(void); asmlinkage long sys32_rt_sigreturn(void);

1
arch/x86/include/asm/syscalls.h
View file

@ -34,7 +34,6 @@ asmlinkage int sys_get_thread_area(struct user_desc __user *);
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
/* kernel/signal.c */ /* kernel/signal.c */
asmlinkage int sys_sigsuspend(int, int, old_sigset_t);
asmlinkage int sys_sigaction(int, const struct old_sigaction __user *, asmlinkage int sys_sigaction(int, const struct old_sigaction __user *,
struct old_sigaction __user *); struct old_sigaction __user *);
unsigned long sys_sigreturn(void); unsigned long sys_sigreturn(void);

11
arch/x86/kernel/signal.c
View file

@ -536,17 +536,6 @@ static int x32_setup_rt_frame(int sig, struct k_sigaction *ka,
} }
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
/*
* Atomically swap in the new signal mask, and wait for a signal.
*/
asmlinkage int
sys_sigsuspend(int history0, int history1, old_sigset_t mask)
{
sigset_t blocked;
siginitset(&blocked, mask);
return sigsuspend(&blocked);
}
asmlinkage int asmlinkage int
sys_sigaction(int sig, const struct old_sigaction __user *act, sys_sigaction(int sig, const struct old_sigaction __user *act,
struct old_sigaction __user *oact) struct old_sigaction __user *oact)

2
arch/x86/syscalls/syscall_32.tbl
View file

@ -78,7 +78,7 @@
69 i386 ssetmask sys_ssetmask 69 i386 ssetmask sys_ssetmask
70 i386 setreuid sys_setreuid16 70 i386 setreuid sys_setreuid16
71 i386 setregid sys_setregid16 71 i386 setregid sys_setregid16
72 i386 sigsuspend sys_sigsuspend sys32_sigsuspend 72 i386 sigsuspend sys_sigsuspend sys_sigsuspend
73 i386 sigpending sys_sigpending compat_sys_sigpending 73 i386 sigpending sys_sigpending compat_sys_sigpending
74 i386 sethostname sys_sethostname 74 i386 sethostname sys_sethostname
75 i386 setrlimit sys_setrlimit compat_sys_setrlimit 75 i386 setrlimit sys_setrlimit compat_sys_setrlimit

1
arch/x86/um/Kconfig
View file

@ -25,6 +25,7 @@ config X86_32
select ARCH_WANT_IPC_PARSE_VERSION select ARCH_WANT_IPC_PARSE_VERSION
select MODULES_USE_ELF_REL select MODULES_USE_ELF_REL
select CLONE_BACKWARDS select CLONE_BACKWARDS
select OLD_SIGSUSPEND3
config X86_64 config X86_64
def_bool 64BIT def_bool 64BIT