aboutsummaryrefslogtreecommitdiffstats
path: root/fs/select.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-04-26 18:31:00 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-06-01 12:58:46 -0400
commit754421c8cab1a568be844a7069fe04c1cf6391b8 (patch)
tree71fa1f54e664ff45289fccfa946747a18e20727f /fs/select.c
parentfb21affa49204acd409328415b49bfe90136653c (diff)
HAVE_RESTORE_SIGMASK is defined on all architectures now
Everyone either defines it in arch thread_info.h or has TIF_RESTORE_SIGMASK and picks default set_restore_sigmask() in linux/thread_info.h. Kill the ifdefs, slap #error in linux/thread_info.h to catch breakage when new ones get merged. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/select.c')
-rw-r--r--fs/select.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/select.c b/fs/select.c
index 17d33d09fc16..bae321569dfa 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -614,7 +614,6 @@ SYSCALL_DEFINE5(select, int, n, fd_set __user *, inp, fd_set __user *, outp,
614 return ret; 614 return ret;
615} 615}
616 616
617#ifdef HAVE_SET_RESTORE_SIGMASK
618static long do_pselect(int n, fd_set __user *inp, fd_set __user *outp, 617static long do_pselect(int n, fd_set __user *inp, fd_set __user *outp,
619 fd_set __user *exp, struct timespec __user *tsp, 618 fd_set __user *exp, struct timespec __user *tsp,
620 const sigset_t __user *sigmask, size_t sigsetsize) 619 const sigset_t __user *sigmask, size_t sigsetsize)
@@ -686,7 +685,6 @@ SYSCALL_DEFINE6(pselect6, int, n, fd_set __user *, inp, fd_set __user *, outp,
686 685
687 return do_pselect(n, inp, outp, exp, tsp, up, sigsetsize); 686 return do_pselect(n, inp, outp, exp, tsp, up, sigsetsize);
688} 687}
689#endif /* HAVE_SET_RESTORE_SIGMASK */
690 688
691#ifdef __ARCH_WANT_SYS_OLD_SELECT 689#ifdef __ARCH_WANT_SYS_OLD_SELECT
692struct sel_arg_struct { 690struct sel_arg_struct {
@@ -941,7 +939,6 @@ SYSCALL_DEFINE3(poll, struct pollfd __user *, ufds, unsigned int, nfds,
941 return ret; 939 return ret;
942} 940}
943 941
944#ifdef HAVE_SET_RESTORE_SIGMASK
945SYSCALL_DEFINE5(ppoll, struct pollfd __user *, ufds, unsigned int, nfds, 942SYSCALL_DEFINE5(ppoll, struct pollfd __user *, ufds, unsigned int, nfds,
946 struct timespec __user *, tsp, const sigset_t __user *, sigmask, 943 struct timespec __user *, tsp, const sigset_t __user *, sigmask,
947 size_t, sigsetsize) 944 size_t, sigsetsize)
@@ -992,4 +989,3 @@ SYSCALL_DEFINE5(ppoll, struct pollfd __user *, ufds, unsigned int, nfds,
992 989
993 return ret; 990 return ret;
994} 991}
995#endif /* HAVE_SET_RESTORE_SIGMASK */