diff options
Diffstat (limited to 'fs/select.c')
-rw-r--r-- | fs/select.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/select.c b/fs/select.c index 00f58c5c7e05..2c292146e246 100644 --- a/fs/select.c +++ b/fs/select.c | |||
@@ -425,7 +425,7 @@ sticky: | |||
425 | return ret; | 425 | return ret; |
426 | } | 426 | } |
427 | 427 | ||
428 | #ifdef TIF_RESTORE_SIGMASK | 428 | #ifdef HAVE_SET_RESTORE_SIGMASK |
429 | asmlinkage long sys_pselect7(int n, fd_set __user *inp, fd_set __user *outp, | 429 | asmlinkage long sys_pselect7(int n, fd_set __user *inp, fd_set __user *outp, |
430 | fd_set __user *exp, struct timespec __user *tsp, | 430 | fd_set __user *exp, struct timespec __user *tsp, |
431 | const sigset_t __user *sigmask, size_t sigsetsize) | 431 | const sigset_t __user *sigmask, size_t sigsetsize) |
@@ -498,7 +498,7 @@ sticky: | |||
498 | if (sigmask) { | 498 | if (sigmask) { |
499 | memcpy(¤t->saved_sigmask, &sigsaved, | 499 | memcpy(¤t->saved_sigmask, &sigsaved, |
500 | sizeof(sigsaved)); | 500 | sizeof(sigsaved)); |
501 | set_thread_flag(TIF_RESTORE_SIGMASK); | 501 | set_restore_sigmask(); |
502 | } | 502 | } |
503 | } else if (sigmask) | 503 | } else if (sigmask) |
504 | sigprocmask(SIG_SETMASK, &sigsaved, NULL); | 504 | sigprocmask(SIG_SETMASK, &sigsaved, NULL); |
@@ -528,7 +528,7 @@ asmlinkage long sys_pselect6(int n, fd_set __user *inp, fd_set __user *outp, | |||
528 | 528 | ||
529 | return sys_pselect7(n, inp, outp, exp, tsp, up, sigsetsize); | 529 | return sys_pselect7(n, inp, outp, exp, tsp, up, sigsetsize); |
530 | } | 530 | } |
531 | #endif /* TIF_RESTORE_SIGMASK */ | 531 | #endif /* HAVE_SET_RESTORE_SIGMASK */ |
532 | 532 | ||
533 | struct poll_list { | 533 | struct poll_list { |
534 | struct poll_list *next; | 534 | struct poll_list *next; |
@@ -759,7 +759,7 @@ asmlinkage long sys_poll(struct pollfd __user *ufds, unsigned int nfds, | |||
759 | return ret; | 759 | return ret; |
760 | } | 760 | } |
761 | 761 | ||
762 | #ifdef TIF_RESTORE_SIGMASK | 762 | #ifdef HAVE_SET_RESTORE_SIGMASK |
763 | asmlinkage long sys_ppoll(struct pollfd __user *ufds, unsigned int nfds, | 763 | asmlinkage long sys_ppoll(struct pollfd __user *ufds, unsigned int nfds, |
764 | struct timespec __user *tsp, const sigset_t __user *sigmask, | 764 | struct timespec __user *tsp, const sigset_t __user *sigmask, |
765 | size_t sigsetsize) | 765 | size_t sigsetsize) |
@@ -805,7 +805,7 @@ asmlinkage long sys_ppoll(struct pollfd __user *ufds, unsigned int nfds, | |||
805 | if (sigmask) { | 805 | if (sigmask) { |
806 | memcpy(¤t->saved_sigmask, &sigsaved, | 806 | memcpy(¤t->saved_sigmask, &sigsaved, |
807 | sizeof(sigsaved)); | 807 | sizeof(sigsaved)); |
808 | set_thread_flag(TIF_RESTORE_SIGMASK); | 808 | set_restore_sigmask(); |
809 | } | 809 | } |
810 | ret = -ERESTARTNOHAND; | 810 | ret = -ERESTARTNOHAND; |
811 | } else if (sigmask) | 811 | } else if (sigmask) |
@@ -839,4 +839,4 @@ asmlinkage long sys_ppoll(struct pollfd __user *ufds, unsigned int nfds, | |||
839 | 839 | ||
840 | return ret; | 840 | return ret; |
841 | } | 841 | } |
842 | #endif /* TIF_RESTORE_SIGMASK */ | 842 | #endif /* HAVE_SET_RESTORE_SIGMASK */ |