diff options
Diffstat (limited to 'fs/compat.c')
-rw-r--r-- | fs/compat.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/compat.c b/fs/compat.c index 2ce4456aad30..139dc93c092d 100644 --- a/fs/compat.c +++ b/fs/compat.c | |||
@@ -1634,7 +1634,7 @@ sticky: | |||
1634 | return ret; | 1634 | return ret; |
1635 | } | 1635 | } |
1636 | 1636 | ||
1637 | #ifdef TIF_RESTORE_SIGMASK | 1637 | #ifdef HAVE_SET_RESTORE_SIGMASK |
1638 | asmlinkage long compat_sys_pselect7(int n, compat_ulong_t __user *inp, | 1638 | asmlinkage long compat_sys_pselect7(int n, compat_ulong_t __user *inp, |
1639 | compat_ulong_t __user *outp, compat_ulong_t __user *exp, | 1639 | compat_ulong_t __user *outp, compat_ulong_t __user *exp, |
1640 | struct compat_timespec __user *tsp, compat_sigset_t __user *sigmask, | 1640 | struct compat_timespec __user *tsp, compat_sigset_t __user *sigmask, |
@@ -1720,7 +1720,7 @@ sticky: | |||
1720 | if (sigmask) { | 1720 | if (sigmask) { |
1721 | memcpy(¤t->saved_sigmask, &sigsaved, | 1721 | memcpy(¤t->saved_sigmask, &sigsaved, |
1722 | sizeof(sigsaved)); | 1722 | sizeof(sigsaved)); |
1723 | set_thread_flag(TIF_RESTORE_SIGMASK); | 1723 | set_restore_sigmask(); |
1724 | } | 1724 | } |
1725 | } else if (sigmask) | 1725 | } else if (sigmask) |
1726 | sigprocmask(SIG_SETMASK, &sigsaved, NULL); | 1726 | sigprocmask(SIG_SETMASK, &sigsaved, NULL); |
@@ -1791,7 +1791,7 @@ asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds, | |||
1791 | if (sigmask) { | 1791 | if (sigmask) { |
1792 | memcpy(¤t->saved_sigmask, &sigsaved, | 1792 | memcpy(¤t->saved_sigmask, &sigsaved, |
1793 | sizeof(sigsaved)); | 1793 | sizeof(sigsaved)); |
1794 | set_thread_flag(TIF_RESTORE_SIGMASK); | 1794 | set_restore_sigmask(); |
1795 | } | 1795 | } |
1796 | ret = -ERESTARTNOHAND; | 1796 | ret = -ERESTARTNOHAND; |
1797 | } else if (sigmask) | 1797 | } else if (sigmask) |
@@ -1825,7 +1825,7 @@ sticky: | |||
1825 | 1825 | ||
1826 | return ret; | 1826 | return ret; |
1827 | } | 1827 | } |
1828 | #endif /* TIF_RESTORE_SIGMASK */ | 1828 | #endif /* HAVE_SET_RESTORE_SIGMASK */ |
1829 | 1829 | ||
1830 | #if defined(CONFIG_NFSD) || defined(CONFIG_NFSD_MODULE) | 1830 | #if defined(CONFIG_NFSD) || defined(CONFIG_NFSD_MODULE) |
1831 | /* Stuff for NFS server syscalls... */ | 1831 | /* Stuff for NFS server syscalls... */ |
@@ -2080,7 +2080,7 @@ long asmlinkage compat_sys_nfsservctl(int cmd, void *notused, void *notused2) | |||
2080 | 2080 | ||
2081 | #ifdef CONFIG_EPOLL | 2081 | #ifdef CONFIG_EPOLL |
2082 | 2082 | ||
2083 | #ifdef TIF_RESTORE_SIGMASK | 2083 | #ifdef HAVE_SET_RESTORE_SIGMASK |
2084 | asmlinkage long compat_sys_epoll_pwait(int epfd, | 2084 | asmlinkage long compat_sys_epoll_pwait(int epfd, |
2085 | struct compat_epoll_event __user *events, | 2085 | struct compat_epoll_event __user *events, |
2086 | int maxevents, int timeout, | 2086 | int maxevents, int timeout, |
@@ -2117,14 +2117,14 @@ asmlinkage long compat_sys_epoll_pwait(int epfd, | |||
2117 | if (err == -EINTR) { | 2117 | if (err == -EINTR) { |
2118 | memcpy(¤t->saved_sigmask, &sigsaved, | 2118 | memcpy(¤t->saved_sigmask, &sigsaved, |
2119 | sizeof(sigsaved)); | 2119 | sizeof(sigsaved)); |
2120 | set_thread_flag(TIF_RESTORE_SIGMASK); | 2120 | set_restore_sigmask(); |
2121 | } else | 2121 | } else |
2122 | sigprocmask(SIG_SETMASK, &sigsaved, NULL); | 2122 | sigprocmask(SIG_SETMASK, &sigsaved, NULL); |
2123 | } | 2123 | } |
2124 | 2124 | ||
2125 | return err; | 2125 | return err; |
2126 | } | 2126 | } |
2127 | #endif /* TIF_RESTORE_SIGMASK */ | 2127 | #endif /* HAVE_SET_RESTORE_SIGMASK */ |
2128 | 2128 | ||
2129 | #endif /* CONFIG_EPOLL */ | 2129 | #endif /* CONFIG_EPOLL */ |
2130 | 2130 | ||