diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-05-07 07:15:46 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-05-07 07:15:46 -0400 |
| commit | 2fe5de9ce7d57498abc14b375cad2fcf8c3ee6cc (patch) | |
| tree | 9478e8cf470c1d5bdb2d89b57a7e35919ab95e72 /include/uapi/linux/capability.h | |
| parent | 08f8aeb55d7727d644dbbbbfb798fe937d47751d (diff) | |
| parent | 2b4cfe64dee0d84506b951d81bf55d9891744d25 (diff) | |
Merge branch 'sched/urgent' into sched/core, to avoid conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/capability.h')
| -rw-r--r-- | include/uapi/linux/capability.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/uapi/linux/capability.h b/include/uapi/linux/capability.h index ba478fa3012e..154dd6d3c8fe 100644 --- a/include/uapi/linux/capability.h +++ b/include/uapi/linux/capability.h | |||
| @@ -308,8 +308,12 @@ struct vfs_cap_data { | |||
| 308 | 308 | ||
| 309 | #define CAP_LEASE 28 | 309 | #define CAP_LEASE 28 |
| 310 | 310 | ||
| 311 | /* Allow writing the audit log via unicast netlink socket */ | ||
| 312 | |||
| 311 | #define CAP_AUDIT_WRITE 29 | 313 | #define CAP_AUDIT_WRITE 29 |
| 312 | 314 | ||
| 315 | /* Allow configuration of audit via unicast netlink socket */ | ||
| 316 | |||
| 313 | #define CAP_AUDIT_CONTROL 30 | 317 | #define CAP_AUDIT_CONTROL 30 |
| 314 | 318 | ||
| 315 | #define CAP_SETFCAP 31 | 319 | #define CAP_SETFCAP 31 |