diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-04-26 18:31:00 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-01 12:58:46 -0400 |
commit | 754421c8cab1a568be844a7069fe04c1cf6391b8 (patch) | |
tree | 71fa1f54e664ff45289fccfa946747a18e20727f /fs | |
parent | fb21affa49204acd409328415b49bfe90136653c (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')
-rw-r--r-- | fs/compat.c | 4 | ||||
-rw-r--r-- | fs/eventpoll.c | 4 | ||||
-rw-r--r-- | fs/select.c | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/fs/compat.c b/fs/compat.c index 6556a9ce8a28..3adf3d4c2cd9 100644 --- a/fs/compat.c +++ b/fs/compat.c | |||
@@ -1547,7 +1547,6 @@ asmlinkage long compat_sys_old_select(struct compat_sel_arg_struct __user *arg) | |||
1547 | compat_ptr(a.exp), compat_ptr(a.tvp)); | 1547 | compat_ptr(a.exp), compat_ptr(a.tvp)); |
1548 | } | 1548 | } |
1549 | 1549 | ||
1550 | #ifdef HAVE_SET_RESTORE_SIGMASK | ||
1551 | static long do_compat_pselect(int n, compat_ulong_t __user *inp, | 1550 | static long do_compat_pselect(int n, compat_ulong_t __user *inp, |
1552 | compat_ulong_t __user *outp, compat_ulong_t __user *exp, | 1551 | compat_ulong_t __user *outp, compat_ulong_t __user *exp, |
1553 | struct compat_timespec __user *tsp, compat_sigset_t __user *sigmask, | 1552 | struct compat_timespec __user *tsp, compat_sigset_t __user *sigmask, |
@@ -1670,11 +1669,9 @@ asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds, | |||
1670 | 1669 | ||
1671 | return ret; | 1670 | return ret; |
1672 | } | 1671 | } |
1673 | #endif /* HAVE_SET_RESTORE_SIGMASK */ | ||
1674 | 1672 | ||
1675 | #ifdef CONFIG_EPOLL | 1673 | #ifdef CONFIG_EPOLL |
1676 | 1674 | ||
1677 | #ifdef HAVE_SET_RESTORE_SIGMASK | ||
1678 | asmlinkage long compat_sys_epoll_pwait(int epfd, | 1675 | asmlinkage long compat_sys_epoll_pwait(int epfd, |
1679 | struct compat_epoll_event __user *events, | 1676 | struct compat_epoll_event __user *events, |
1680 | int maxevents, int timeout, | 1677 | int maxevents, int timeout, |
@@ -1718,7 +1715,6 @@ asmlinkage long compat_sys_epoll_pwait(int epfd, | |||
1718 | 1715 | ||
1719 | return err; | 1716 | return err; |
1720 | } | 1717 | } |
1721 | #endif /* HAVE_SET_RESTORE_SIGMASK */ | ||
1722 | 1718 | ||
1723 | #endif /* CONFIG_EPOLL */ | 1719 | #endif /* CONFIG_EPOLL */ |
1724 | 1720 | ||
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 079d1be65ba9..74598f67efeb 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c | |||
@@ -1853,8 +1853,6 @@ error_return: | |||
1853 | return error; | 1853 | return error; |
1854 | } | 1854 | } |
1855 | 1855 | ||
1856 | #ifdef HAVE_SET_RESTORE_SIGMASK | ||
1857 | |||
1858 | /* | 1856 | /* |
1859 | * Implement the event wait interface for the eventpoll file. It is the kernel | 1857 | * Implement the event wait interface for the eventpoll file. It is the kernel |
1860 | * part of the user space epoll_pwait(2). | 1858 | * part of the user space epoll_pwait(2). |
@@ -1899,8 +1897,6 @@ SYSCALL_DEFINE6(epoll_pwait, int, epfd, struct epoll_event __user *, events, | |||
1899 | return error; | 1897 | return error; |
1900 | } | 1898 | } |
1901 | 1899 | ||
1902 | #endif /* HAVE_SET_RESTORE_SIGMASK */ | ||
1903 | |||
1904 | static int __init eventpoll_init(void) | 1900 | static int __init eventpoll_init(void) |
1905 | { | 1901 | { |
1906 | struct sysinfo si; | 1902 | struct sysinfo si; |
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 | ||
618 | static long do_pselect(int n, fd_set __user *inp, fd_set __user *outp, | 617 | static 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 |
692 | struct sel_arg_struct { | 690 | struct 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 | ||
945 | SYSCALL_DEFINE5(ppoll, struct pollfd __user *, ufds, unsigned int, nfds, | 942 | SYSCALL_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 */ | ||