diff options
-rw-r--r-- | fs/eventpoll.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 34f68f3a069a..81c04abfb1aa 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c | |||
@@ -656,8 +656,7 @@ is_linked: | |||
656 | * wait list. | 656 | * wait list. |
657 | */ | 657 | */ |
658 | if (waitqueue_active(&ep->wq)) | 658 | if (waitqueue_active(&ep->wq)) |
659 | __wake_up_locked(&ep->wq, TASK_UNINTERRUPTIBLE | | 659 | wake_up_locked(&ep->wq); |
660 | TASK_INTERRUPTIBLE); | ||
661 | if (waitqueue_active(&ep->poll_wait)) | 660 | if (waitqueue_active(&ep->poll_wait)) |
662 | pwake++; | 661 | pwake++; |
663 | 662 | ||
@@ -780,7 +779,7 @@ static int ep_insert(struct eventpoll *ep, struct epoll_event *event, | |||
780 | 779 | ||
781 | /* Notify waiting tasks that events are available */ | 780 | /* Notify waiting tasks that events are available */ |
782 | if (waitqueue_active(&ep->wq)) | 781 | if (waitqueue_active(&ep->wq)) |
783 | __wake_up_locked(&ep->wq, TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE); | 782 | wake_up_locked(&ep->wq); |
784 | if (waitqueue_active(&ep->poll_wait)) | 783 | if (waitqueue_active(&ep->poll_wait)) |
785 | pwake++; | 784 | pwake++; |
786 | } | 785 | } |
@@ -854,8 +853,7 @@ static int ep_modify(struct eventpoll *ep, struct epitem *epi, struct epoll_even | |||
854 | 853 | ||
855 | /* Notify waiting tasks that events are available */ | 854 | /* Notify waiting tasks that events are available */ |
856 | if (waitqueue_active(&ep->wq)) | 855 | if (waitqueue_active(&ep->wq)) |
857 | __wake_up_locked(&ep->wq, TASK_UNINTERRUPTIBLE | | 856 | wake_up_locked(&ep->wq); |
858 | TASK_INTERRUPTIBLE); | ||
859 | if (waitqueue_active(&ep->poll_wait)) | 857 | if (waitqueue_active(&ep->poll_wait)) |
860 | pwake++; | 858 | pwake++; |
861 | } | 859 | } |
@@ -978,8 +976,7 @@ errxit: | |||
978 | * wait list (delayed after we release the lock). | 976 | * wait list (delayed after we release the lock). |
979 | */ | 977 | */ |
980 | if (waitqueue_active(&ep->wq)) | 978 | if (waitqueue_active(&ep->wq)) |
981 | __wake_up_locked(&ep->wq, TASK_UNINTERRUPTIBLE | | 979 | wake_up_locked(&ep->wq); |
982 | TASK_INTERRUPTIBLE); | ||
983 | if (waitqueue_active(&ep->poll_wait)) | 980 | if (waitqueue_active(&ep->poll_wait)) |
984 | pwake++; | 981 | pwake++; |
985 | } | 982 | } |