summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2013-09-25 14:55:55 -0700
committerMichael Wright <michaelwr@google.com>2013-09-25 14:55:55 -0700
commit8bd5aa6a7678d4b15dc195f207969a01f425f1fd (patch)
tree8b219485c78558081839a83c6a0c2775938e297c
parent99b859cf786f208300f7fc3a6fa5b570c3333433 (diff)
downloadbionic-8bd5aa6a7678d4b15dc195f207969a01f425f1fd.zip
bionic-8bd5aa6a7678d4b15dc195f207969a01f425f1fd.tar.gz
bionic-8bd5aa6a7678d4b15dc195f207969a01f425f1fd.tar.bz2
Update capability.h
To upstream SHA 6e4664525b1db28f8c4e1130957f70a94c19213e (v3.11) Change-Id: Ic0d95464bc9001246df898489b2ea603a97ca231
-rw-r--r--libc/kernel/common/linux/capability.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/libc/kernel/common/linux/capability.h b/libc/kernel/common/linux/capability.h
index 68a6e0d..c0ab4d9 100644
--- a/libc/kernel/common/linux/capability.h
+++ b/libc/kernel/common/linux/capability.h
@@ -16,8 +16,8 @@
***
****************************************************************************
****************************************************************************/
-#ifndef _LINUX_CAPABILITY_H
-#define _LINUX_CAPABILITY_H
+#ifndef _UAPI_LINUX_CAPABILITY_H
+#define _UAPI_LINUX_CAPABILITY_H
#include <linux/types.h>
struct task_struct;
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
@@ -112,9 +112,10 @@ struct vfs_cap_data {
#define CAP_SYSLOG 34
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define CAP_WAKE_ALARM 35
-#define CAP_LAST_CAP CAP_WAKE_ALARM
+#define CAP_BLOCK_SUSPEND 36
+#define CAP_LAST_CAP CAP_BLOCK_SUSPEND
#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
-#define CAP_TO_INDEX(x) ((x) >> 5)
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define CAP_TO_INDEX(x) ((x) >> 5)
#define CAP_TO_MASK(x) (1 << ((x) & 31))
#endif