diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 17:45:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 17:45:08 -0700 |
| commit | 78c4def67e8eebe602655a3dec9aa08f0e2f7c4b (patch) | |
| tree | 8c0c756bbff7325f5c2a773f8cc64d8390ebe5b5 /include/linux/capability.h | |
| parent | 7e6628e4bcb3b3546c625ec63ca724f28ab14f0c (diff) | |
| parent | 942c3c5c329274fa6de5998cb911cf3d0a42d0b1 (diff) | |
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
hrtimer: Make lookup table const
RTC: Disable CONFIG_RTC_CLASS from being built as a module
timers: Fix alarmtimer build issues when CONFIG_RTC_CLASS=n
timers: Remove delayed irqwork from alarmtimers implementation
timers: Improve alarmtimer comments and minor fixes
timers: Posix interface for alarm-timers
timers: Introduce in-kernel alarm-timer interface
timers: Add rb_init_node() to allow for stack allocated rb nodes
time: Add timekeeping_inject_sleeptime
Diffstat (limited to 'include/linux/capability.h')
| -rw-r--r-- | include/linux/capability.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/capability.h b/include/linux/capability.h index d4675af963f..4554db0cde8 100644 --- a/include/linux/capability.h +++ b/include/linux/capability.h @@ -355,7 +355,12 @@ struct cpu_vfs_cap_data { #define CAP_SYSLOG 34 -#define CAP_LAST_CAP CAP_SYSLOG +/* Allow triggering something that will wake the system */ + +#define CAP_WAKE_ALARM 35 + + +#define CAP_LAST_CAP CAP_WAKE_ALARM #define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP) |