summaryrefslogtreecommitdiffstats
path: root/fs/eventpoll.c
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2013-11-15 12:56:31 +0530
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-03 15:35:52 +0100
commit95f19f658ce177387345b51bd48fed7b9cd7d4e8 (patch)
tree90ab9da7e5f8033a9133293f6793916e65a758be /fs/eventpoll.c
parentdc1ccc48159d63eca5089e507c82c7d22ef60839 (diff)
downloadlinux-stable-95f19f658ce177387345b51bd48fed7b9cd7d4e8.tar.gz
linux-stable-95f19f658ce177387345b51bd48fed7b9cd7d4e8.tar.bz2
linux-stable-95f19f658ce177387345b51bd48fed7b9cd7d4e8.zip
epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled
Drop EPOLLWAKEUP from epoll events mask if CONFIG_PM_SLEEP is disabled. Signed-off-by: Amit Pundir <amit.pundir@linaro.org> Cc: John Stultz <john.stultz@linaro.org> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'fs/eventpoll.c')
-rw-r--r--fs/eventpoll.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 79b65c3b9e87..8b5e2584c840 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -1852,8 +1852,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