diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-17 14:15:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-17 14:15:43 -0700 |
| commit | a5e135122c9c5af9e63962e13159174c3aaea858 (patch) | |
| tree | 7d946840ff28f0d3a34a1bf2c4c7d448e3677627 /include | |
| parent | a018540141a931f5299a866907b27886916b4374 (diff) | |
| parent | d9914cf66181b8aa0929775f5c6f675c6ebc3eb5 (diff) | |
| download | linux-3.10-a5e135122c9c5af9e63962e13159174c3aaea858.tar.gz linux-3.10-a5e135122c9c5af9e63962e13159174c3aaea858.tar.bz2 linux-3.10-a5e135122c9c5af9e63962e13159174c3aaea858.zip | |
Merge tag 'pm-post-3.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull a last-minute PM update from Rafael J. Wysocki:
"This renames CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND to encourage future
reuse of the capability in question in related cases."
* tag 'pm-post-3.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/capability.h | 6 | ||||
| -rw-r--r-- | include/linux/eventpoll.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/capability.h b/include/linux/capability.h index 68d56effc32..d10b7ed595b 100644 --- a/include/linux/capability.h +++ b/include/linux/capability.h @@ -360,11 +360,11 @@ struct cpu_vfs_cap_data { #define CAP_WAKE_ALARM 35 -/* Allow preventing system suspends while epoll events are pending */ +/* Allow preventing system suspends */ -#define CAP_EPOLLWAKEUP 36 +#define CAP_BLOCK_SUSPEND 36 -#define CAP_LAST_CAP CAP_EPOLLWAKEUP +#define CAP_LAST_CAP CAP_BLOCK_SUSPEND #define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP) diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h index 6f8be328770..f4bb378ccf6 100644 --- a/include/linux/eventpoll.h +++ b/include/linux/eventpoll.h @@ -34,7 +34,7 @@ * re-allowed until epoll_wait is called again after consuming the wakeup * event(s). * - * Requires CAP_EPOLLWAKEUP + * Requires CAP_BLOCK_SUSPEND */ #define EPOLLWAKEUP (1 << 29) |