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 <roland@redhat.com> Cc: Oleg Nesterov <oleg@tv-sign.ru> Cc: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: "Luck, Tony" <tony.luck@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

کامیت شده توسط
Linus Torvalds

والد
49eaeb4bc4
کامیت
f3de272b82
@@ -1634,7 +1634,7 @@ sticky:
|
||||
return ret;
|
||||
}
|
||||
|
||||
#ifdef TIF_RESTORE_SIGMASK
|
||||
#ifdef HAVE_SET_RESTORE_SIGMASK
|
||||
asmlinkage long compat_sys_pselect7(int n, compat_ulong_t __user *inp,
|
||||
compat_ulong_t __user *outp, compat_ulong_t __user *exp,
|
||||
struct compat_timespec __user *tsp, compat_sigset_t __user *sigmask,
|
||||
@@ -1825,7 +1825,7 @@ sticky:
|
||||
|
||||
return ret;
|
||||
}
|
||||
#endif /* TIF_RESTORE_SIGMASK */
|
||||
#endif /* HAVE_SET_RESTORE_SIGMASK */
|
||||
|
||||
#if defined(CONFIG_NFSD) || defined(CONFIG_NFSD_MODULE)
|
||||
/* Stuff for NFS server syscalls... */
|
||||
@@ -2080,7 +2080,7 @@ long asmlinkage compat_sys_nfsservctl(int cmd, void *notused, void *notused2)
|
||||
|
||||
#ifdef CONFIG_EPOLL
|
||||
|
||||
#ifdef TIF_RESTORE_SIGMASK
|
||||
#ifdef HAVE_SET_RESTORE_SIGMASK
|
||||
asmlinkage long compat_sys_epoll_pwait(int epfd,
|
||||
struct compat_epoll_event __user *events,
|
||||
int maxevents, int timeout,
|
||||
@@ -2124,7 +2124,7 @@ asmlinkage long compat_sys_epoll_pwait(int epfd,
|
||||
|
||||
return err;
|
||||
}
|
||||
#endif /* TIF_RESTORE_SIGMASK */
|
||||
#endif /* HAVE_SET_RESTORE_SIGMASK */
|
||||
|
||||
#endif /* CONFIG_EPOLL */
|
||||
|
||||
|
مرجع در شماره جدید
Block a user