mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
signals: use HAVE_SET_RESTORE_SIGMASK
Change all the #ifdef TIF_RESTORE_SIGMASK conditionals in non-arch code to #ifdef HAVE_SET_RESTORE_SIGMASK. If arch code defines it first, the generic set_restore_sigmask() using TIF_RESTORE_SIGMASK is not defined. Signed-off-by: Roland McGrath <[email protected]> Cc: Oleg Nesterov <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Martin Schwidefsky <[email protected]> Cc: Heiko Carstens <[email protected]> Cc: "Luck, Tony" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
49eaeb4bc4
commit
f3de272b82
5 changed files with 19 additions and 13 deletions
|
|
@ -425,7 +425,7 @@ sticky:
|
|||
return ret;
|
||||
}
|
||||
|
||||
#ifdef TIF_RESTORE_SIGMASK
|
||||
#ifdef HAVE_SET_RESTORE_SIGMASK
|
||||
asmlinkage long sys_pselect7(int n, fd_set __user *inp, fd_set __user *outp,
|
||||
fd_set __user *exp, struct timespec __user *tsp,
|
||||
const sigset_t __user *sigmask, size_t sigsetsize)
|
||||
|
|
@ -528,7 +528,7 @@ asmlinkage long sys_pselect6(int n, fd_set __user *inp, fd_set __user *outp,
|
|||
|
||||
return sys_pselect7(n, inp, outp, exp, tsp, up, sigsetsize);
|
||||
}
|
||||
#endif /* TIF_RESTORE_SIGMASK */
|
||||
#endif /* HAVE_SET_RESTORE_SIGMASK */
|
||||
|
||||
struct poll_list {
|
||||
struct poll_list *next;
|
||||
|
|
@ -759,7 +759,7 @@ asmlinkage long sys_poll(struct pollfd __user *ufds, unsigned int nfds,
|
|||
return ret;
|
||||
}
|
||||
|
||||
#ifdef TIF_RESTORE_SIGMASK
|
||||
#ifdef HAVE_SET_RESTORE_SIGMASK
|
||||
asmlinkage long sys_ppoll(struct pollfd __user *ufds, unsigned int nfds,
|
||||
struct timespec __user *tsp, const sigset_t __user *sigmask,
|
||||
size_t sigsetsize)
|
||||
|
|
@ -839,4 +839,4 @@ asmlinkage long sys_ppoll(struct pollfd __user *ufds, unsigned int nfds,
|
|||
|
||||
return ret;
|
||||
}
|
||||
#endif /* TIF_RESTORE_SIGMASK */
|
||||
#endif /* HAVE_SET_RESTORE_SIGMASK */
|
||||
|
|
|
|||
Loading…
Reference in a new issue