diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-25 13:57:16 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-14 09:17:52 -0500 |
commit | 630cfbbbe656fb0377a6847606016d88cef7675a (patch) | |
tree | 7566bd8cd6f5ddbd83266702553ee69a88ce5ef7 /arch/arm64 | |
parent | 207bdae452e6d3eeba19cc3912e5dfb088adc376 (diff) |
arm64: switch to generic compat rt_sigprocmask()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/arm64')
-rw-r--r-- | arch/arm64/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm64/kernel/signal32.c | 33 |
2 files changed, 1 insertions, 33 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index d9c901dd3fdb..4b99d632329e 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig | |||
@@ -6,6 +6,7 @@ config ARM64 | |||
6 | select CLONE_BACKWARDS | 6 | select CLONE_BACKWARDS |
7 | select COMMON_CLK | 7 | select COMMON_CLK |
8 | select GENERIC_CLOCKEVENTS | 8 | select GENERIC_CLOCKEVENTS |
9 | select GENERIC_COMPAT_RT_SIGPROCMASK | ||
9 | select GENERIC_HARDIRQS_NO_DEPRECATED | 10 | select GENERIC_HARDIRQS_NO_DEPRECATED |
10 | select GENERIC_IOMAP | 11 | select GENERIC_IOMAP |
11 | select GENERIC_IRQ_PROBE | 12 | select GENERIC_IRQ_PROBE |
diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c index 54920c5342b2..dcc13bd94fb0 100644 --- a/arch/arm64/kernel/signal32.c +++ b/arch/arm64/kernel/signal32.c | |||
@@ -693,39 +693,6 @@ int compat_setup_frame(int usig, struct k_sigaction *ka, sigset_t *set, | |||
693 | return err; | 693 | return err; |
694 | } | 694 | } |
695 | 695 | ||
696 | /* | ||
697 | * RT signals don't have generic compat wrappers. | ||
698 | * See arch/powerpc/kernel/signal_32.c | ||
699 | */ | ||
700 | asmlinkage int compat_sys_rt_sigprocmask(int how, compat_sigset_t __user *set, | ||
701 | compat_sigset_t __user *oset, | ||
702 | compat_size_t sigsetsize) | ||
703 | { | ||
704 | sigset_t s; | ||
705 | sigset_t __user *up; | ||
706 | int ret; | ||
707 | mm_segment_t old_fs = get_fs(); | ||
708 | |||
709 | if (set) { | ||
710 | if (get_sigset_t(&s, set)) | ||
711 | return -EFAULT; | ||
712 | } | ||
713 | |||
714 | set_fs(KERNEL_DS); | ||
715 | /* This is valid because of the set_fs() */ | ||
716 | up = (sigset_t __user *) &s; | ||
717 | ret = sys_rt_sigprocmask(how, set ? up : NULL, oset ? up : NULL, | ||
718 | sigsetsize); | ||
719 | set_fs(old_fs); | ||
720 | if (ret) | ||
721 | return ret; | ||
722 | if (oset) { | ||
723 | if (put_sigset_t(oset, &s)) | ||
724 | return -EFAULT; | ||
725 | } | ||
726 | return 0; | ||
727 | } | ||
728 | |||
729 | asmlinkage int compat_sys_rt_sigpending(compat_sigset_t __user *set, | 696 | asmlinkage int compat_sys_rt_sigpending(compat_sigset_t __user *set, |
730 | compat_size_t sigsetsize) | 697 | compat_size_t sigsetsize) |
731 | { | 698 | { |