diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-22 14:57:19 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-22 14:57:19 -0400 |
| commit | 8714c8d74d313c3ba27bf9c2aaacb1ad71c644f8 (patch) | |
| tree | fa41917de975bf7079e39277a03e0a50bf893441 /fs | |
| parent | 0033c154a907885c647bc7929fe4bc6bc3b23743 (diff) | |
| parent | a8159414d7e3af7233e7a5a82d1c5d85379bd75c (diff) | |
Merge branch 'pm-sleep'
* pm-sleep:
epoll: Fix user space breakage related to EPOLLWAKEUP
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/eventpoll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 2cf0f2153be5..079d1be65ba9 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c | |||
| @@ -1711,7 +1711,7 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd, | |||
| 1711 | 1711 | ||
| 1712 | /* Check if EPOLLWAKEUP is allowed */ | 1712 | /* Check if EPOLLWAKEUP is allowed */ |
| 1713 | if ((epds.events & EPOLLWAKEUP) && !capable(CAP_EPOLLWAKEUP)) | 1713 | if ((epds.events & EPOLLWAKEUP) && !capable(CAP_EPOLLWAKEUP)) |
| 1714 | goto error_tgt_fput; | 1714 | epds.events &= ~EPOLLWAKEUP; |
| 1715 | 1715 | ||
| 1716 | /* | 1716 | /* |
| 1717 | * We have to check that the file structure underneath the file descriptor | 1717 | * We have to check that the file structure underneath the file descriptor |