diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-11 21:15:09 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-11 21:15:09 +0200 |
| commit | 351520a9ebfdf2f36cd97c1192f280e0ac7fdcfc (patch) | |
| tree | 8f177d2c59be90ebcedc98ed508832a7ebbd7e0a /include/linux/capability.h | |
| parent | e6d18093ea3d1d30a4de9e29cb1676c1f4b55147 (diff) | |
| parent | 4e585d25e120f1eae0a3a8bf8f6ebc7692afec18 (diff) | |
Merge branch 'pm-sleep'
* pm-sleep:
PM / Sleep: User space wakeup sources garbage collector Kconfig option
PM / Sleep: Make the limit of user space wakeup sources configurable
PM / Documentation: suspend-and-cpuhotplug.txt: Fix typo
PM / Sleep: Fix a mistake in a conditional in autosleep_store()
epoll: Add a flag, EPOLLWAKEUP, to prevent suspend while epoll events are ready
PM / Sleep: Add user space interface for manipulating wakeup sources, v3
PM / Sleep: Add "prevent autosleep time" statistics to wakeup sources
PM / Sleep: Implement opportunistic sleep, v2
PM / Sleep: Add wakeup_source_activate and wakeup_source_deactivate tracepoints
PM / Sleep: Change wakeup source statistics to follow Android
PM / Sleep: Use wait queue to signal "no wakeup events in progress"
PM / Sleep: Look for wakeup events in later stages of device suspend
PM / Hibernate: Hibernate/thaw fixes/improvements
Diffstat (limited to 'include/linux/capability.h')
| -rw-r--r-- | include/linux/capability.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/capability.h b/include/linux/capability.h index 12d52dedb22..c398cff3dab 100644 --- a/include/linux/capability.h +++ b/include/linux/capability.h @@ -360,8 +360,11 @@ struct cpu_vfs_cap_data { #define CAP_WAKE_ALARM 35 +/* Allow preventing system suspends while epoll events are pending */ -#define CAP_LAST_CAP CAP_WAKE_ALARM +#define CAP_EPOLLWAKEUP 36 + +#define CAP_LAST_CAP CAP_EPOLLWAKEUP #define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP) |