vserver 2.0 rc7

[linux-2.6.git] / include / linux / capability.h

diff --git a/include/linux/capability.h b/include/linux/capability.h
index 7798d2c..2102364 100644 (file)
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -44,8 +44,6 @@ typedef struct __user_cap_data_struct {
 
 #include <linux/spinlock.h>
 
-extern spinlock_t task_capability_lock;
-
 /* #define STRICT_CAP_T_TYPECHECKS */
 
 #ifdef STRICT_CAP_T_TYPECHECKS
@@ -285,10 +283,14 @@ typedef __u32 kernel_cap_t;
 
 #define CAP_LEASE            28
 
+#define CAP_AUDIT_WRITE      29
+
+#define CAP_AUDIT_CONTROL    30
+
 /* Allow context manipulations */
 /* Allow changing context info on files */
 
-#define CAP_CONTEXT          29
+#define CAP_CONTEXT         31
 
 #ifdef __KERNEL__
 /*