Merge

diff --cc fs/eventpoll.c
index 250da657ad27dc0d41f9f4d83ca6dec5dfb80612,eb21947f3d19af08f7feb35cc95dbfa760e6fc1d..19d8d9214d62e589aa24993a3dbf9d6391982326
--- 1/fs/eventpoll.c
--- 2/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@@ -892,16 -862,6 +892,14 @@@ static int ep_insert(struct eventpoll *
         */
        revents = tfile->f_op->poll(tfile, &epq.pt);
  
-       poll_freewait(&epq.pt);
- 
 +      /*
 +       * We have to check if something went wrong during the poll wait queue
 +       * install process. Namely an allocation for a wait queue failed due
 +       * high memory pressure.
 +       */
 +      if (dpi->nwait < 0)
 +              goto eexit_2;
 +
        /* We have to drop the new item inside our item list to keep track of it */
        write_lock_irqsave(&ep->lock, flags);