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/compat.c | |
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/compat.c')
-rw-r--r-- | fs/compat.c | 4 |
1 files changed, 0 insertions, 4 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 | ||