diff options
| author | NeilBrown <neilb@suse.de> | 2012-08-01 06:40:02 -0400 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2012-08-01 06:40:02 -0400 |
| commit | bb181e2e48f8c85db08c9cb015cbba9618dbf05c (patch) | |
| tree | 191bc24dd97bcb174535cc217af082f16da3b43d /fs/eventpoll.c | |
| parent | d57368afe63b3b7b45ce6c2b8c5276417935be2f (diff) | |
| parent | c039c332f23e794deb6d6f37b9f07ff3b27fb2cf (diff) | |
Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md
Pull in pre-requisites for adding raid10 support to dm-raid.
Diffstat (limited to 'fs/eventpoll.c')
| -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 74598f67efeb..1c8b55670804 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c | |||
| @@ -1710,7 +1710,7 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd, | |||
| 1710 | goto error_tgt_fput; | 1710 | goto error_tgt_fput; |
| 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_BLOCK_SUSPEND)) |
| 1714 | epds.events &= ~EPOLLWAKEUP; | 1714 | epds.events &= ~EPOLLWAKEUP; |
| 1715 | 1715 | ||
| 1716 | /* | 1716 | /* |