shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-04-20 04:21:14 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/jstultz/android into linux-linaro-lsk-android

Browse Source
This commit is contained in:
Mark Brown
2014-01-22 15:36:05 +00:00
parent c23fe50e76 62630f14d3
commit e986cff797
19 changed files with 464 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/uapi/linux/eventpoll.h
View File

@@ -61,5 +61,16 @@ struct epoll_event {
__u64 data;
} EPOLL_PACKED;
#ifdef CONFIG_PM_SLEEP
static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev)
{
if ((epev->events & EPOLLWAKEUP) && !capable(CAP_BLOCK_SUSPEND))
epev->events &= ~EPOLLWAKEUP;
}
#else
static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev)
{
epev->events &= ~EPOLLWAKEUP;
}
#endif
#endif /* _UAPI_LINUX_EVENTPOLL_H */