aboutsummaryrefslogtreecommitdiffstats
path: root/fs/eventpoll.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>2008-04-30 03:53:09 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-30 11:29:37 -0400
commitf3de272b821accbc8387211977c2de4f38468d05 (patch)
tree775b5b3db5a09176447d4e62e04077b63640a4d7 /fs/eventpoll.c
parent49eaeb4bc4c901c327ee259c7768be20fd020a30 (diff)
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>
Diffstat (limited to 'fs/eventpoll.c')
-rw-r--r--fs/eventpoll.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 71af2fc0041e..221086fef174 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -1241,7 +1241,7 @@ error_return:
1241 return error; 1241 return error;
1242} 1242}
1243 1243
1244#ifdef TIF_RESTORE_SIGMASK 1244#ifdef HAVE_SET_RESTORE_SIGMASK
1245 1245
1246/* 1246/*
1247 * Implement the event wait interface for the eventpoll file. It is the kernel 1247 * 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,
1287 return error; 1287 return error;
1288} 1288}
1289 1289
1290#endif /* #ifdef TIF_RESTORE_SIGMASK */ 1290#endif /* HAVE_SET_RESTORE_SIGMASK */
1291 1291
1292static int __init eventpoll_init(void) 1292static int __init eventpoll_init(void)
1293{ 1293{