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:
committed by
Linus Torvalds
parent
49eaeb4bc4
commit
f3de272b82
@@ -1241,7 +1241,7 @@ error_return:
|
||||
return error;
|
||||
}
|
||||
|
||||
#ifdef TIF_RESTORE_SIGMASK
|
||||
#ifdef HAVE_SET_RESTORE_SIGMASK
|
||||
|
||||
/*
|
||||
* Implement the event wait interface for the eventpoll file. It is the kernel
|
||||
@@ -1287,7 +1287,7 @@ asmlinkage long sys_epoll_pwait(int epfd, struct epoll_event __user *events,
|
||||
return error;
|
||||
}
|
||||
|
||||
#endif /* #ifdef TIF_RESTORE_SIGMASK */
|
||||
#endif /* HAVE_SET_RESTORE_SIGMASK */
|
||||
|
||||
static int __init eventpoll_init(void)
|
||||
{
|
||||
|
Reference in New Issue
Block a user