diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-19 17:59:07 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-19 17:59:07 -0400 |
| commit | 4e9816d012dbc28dc89559261c6ffbf8ffc440dd (patch) | |
| tree | dee9f8b31f3d6d2fb141541da88e1cc1329b017e /include/uapi/linux/capability.h | |
| parent | da98f44f27d81d7fe9a41f69af4fe08c18d13b56 (diff) | |
| parent | 1795cd9b3a91d4b5473c97f491d63892442212ab (diff) | |
Merge tag 'v3.16-rc5' into next/fixes-non-critical
Linux 3.16-rc5
Diffstat (limited to 'include/uapi/linux/capability.h')
| -rw-r--r-- | include/uapi/linux/capability.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/uapi/linux/capability.h b/include/uapi/linux/capability.h index 154dd6d3c8fe..12c37a197d24 100644 --- a/include/uapi/linux/capability.h +++ b/include/uapi/linux/capability.h | |||
| @@ -347,7 +347,12 @@ struct vfs_cap_data { | |||
| 347 | 347 | ||
| 348 | #define CAP_BLOCK_SUSPEND 36 | 348 | #define CAP_BLOCK_SUSPEND 36 |
| 349 | 349 | ||
| 350 | #define CAP_LAST_CAP CAP_BLOCK_SUSPEND | 350 | /* Allow reading the audit log via multicast netlink socket */ |
| 351 | |||
| 352 | #define CAP_AUDIT_READ 37 | ||
| 353 | |||
| 354 | |||
| 355 | #define CAP_LAST_CAP CAP_AUDIT_READ | ||
| 351 | 356 | ||
| 352 | #define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP) | 357 | #define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP) |
| 353 | 358 | ||