2.6.25-rc4

 fs

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 34f68f3..a415f42 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -353,7 +353,7 @@ static void ep_poll_safewake(struct poll_safewake *psw, wait_queue_head_t *wq)
    spin_unlock_irqrestore(&psw->lock, flags);
 
    /* Do really wake up now */
-   wake_up(wq);
+   wake_up_nested(wq, 1 + wake_nests);
 
    /* Remove the current task from the list */
    spin_lock_irqsave(&psw->lock, flags);
@@ -656,8 +656,7 @@ is_linked:
     * wait list.
     */
    if (waitqueue_active(&ep->wq))
-      __wake_up_locked(&ep->wq, TASK_UNINTERRUPTIBLE |
-             TASK_INTERRUPTIBLE);
+      wake_up_locked(&ep->wq);
    if (waitqueue_active(&ep->poll_wait))
       pwake++;
 
@@ -780,7 +779,7 @@ static int ep_insert(struct eventpoll *ep, struct epoll_event *event,
 
       /* Notify waiting tasks that events are available */
       if (waitqueue_active(&ep->wq))
-         __wake_up_locked(&ep->wq, TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE);
+         wake_up_locked(&ep->wq);
       if (waitqueue_active(&ep->poll_wait))
          pwake++;
    }
@@ -854,8 +853,7 @@ static int ep_modify(struct eventpoll *ep, struct epitem *epi, struct epoll_even
 
          /* Notify waiting tasks that events are available */
          if (waitqueue_active(&ep->wq))
-            __wake_up_locked(&ep->wq, TASK_UNINTERRUPTIBLE |
-                   TASK_INTERRUPTIBLE);
+            wake_up_locked(&ep->wq);
          if (waitqueue_active(&ep->poll_wait))
             pwake++;
       }
@@ -978,8 +976,7 @@ errxit:
        * wait list (delayed after we release the lock).
        */
       if (waitqueue_active(&ep->wq))
-         __wake_up_locked(&ep->wq, TASK_UNINTERRUPTIBLE |
-                TASK_INTERRUPTIBLE);
+         wake_up_locked(&ep->wq);
       if (waitqueue_active(&ep->poll_wait))
          pwake++;
    }