diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-22 15:36:05 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-22 15:36:05 +0000 |
| commit | e986cff7970bb3de117c92db44cf3618848ddb25 (patch) | |
| tree | 14a92a9bcc5aadfdde5d614132db1b278d53069f /fs | |
| parent | c23fe50e76a70704141d0c2d86afddaeb16993bd (diff) | |
| parent | 62630f14d3bf96af7772b288bcd272694083ea14 (diff) | |
Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/jstultz/android into linux-linaro-lsk-android
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/eventpoll.c | 3 | ||||
| -rw-r--r-- | fs/timerfd.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 0cff4434880..db10e00c971 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -1819,8 +1819,7 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd, goto error_tgt_fput; /* Check if EPOLLWAKEUP is allowed */ - if ((epds.events & EPOLLWAKEUP) && !capable(CAP_BLOCK_SUSPEND)) - epds.events &= ~EPOLLWAKEUP; + ep_take_care_of_epollwakeup(&epds); /* * We have to check that the file structure underneath the file descriptor diff --git a/fs/timerfd.c b/fs/timerfd.c index 929312180dd..0013142c047 100644 --- a/fs/timerfd.c +++ b/fs/timerfd.c @@ -317,6 +317,7 @@ SYSCALL_DEFINE2(timerfd_create, int, clockid, int, flags) (clockid != CLOCK_MONOTONIC && clockid != CLOCK_REALTIME && clockid != CLOCK_REALTIME_ALARM && + clockid != CLOCK_BOOTTIME && clockid != CLOCK_BOOTTIME_ALARM)) return -EINVAL; |