Merge branch 'pm-sleep'

* pm-sleep:
  epoll: Fix user space breakage related to EPOLLWAKEUP
This commit is contained in:
Rafael J. Wysocki 2012-05-22 20:57:19 +02:00
commit 8714c8d74d

View File

@ -1711,7 +1711,7 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd,
/* Check if EPOLLWAKEUP is allowed */
if ((epds.events & EPOLLWAKEUP) && !capable(CAP_EPOLLWAKEUP))
goto error_tgt_fput;
epds.events &= ~EPOLLWAKEUP;
/*
* We have to check that the file structure underneath the file descriptor