X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fcapability.h;h=3e569739b463acce22fa3dd557e271bc7d6229b0;hb=refs%2Fheads%2Fvserver;hp=7798d2c26afd03877b171e81f123b5d9fb1a231a;hpb=a8e794ca871505c8ea96cc102f4ad555c5231d7f;p=linux-2.6.git

diff --git a/include/linux/capability.h b/include/linux/capability.h
index 7798d2c26..3e569739b 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -43,8 +43,7 @@ typedef struct __user_cap_data_struct {
 #ifdef __KERNEL__
 
 #include <linux/spinlock.h>
-
-extern spinlock_t task_capability_lock;
+#include <asm/current.h>
 
 /* #define STRICT_CAP_T_TYPECHECKS */
 
@@ -235,6 +234,7 @@ typedef __u32 kernel_cap_t;
 /* Allow enabling/disabling tagged queuing on SCSI controllers and sending
    arbitrary SCSI commands */
 /* Allow setting encryption key on loopback filesystem */
+/* Allow setting zone reclaim policy */
 /* Allow the selection of a security context */
 
 #define CAP_SYS_ADMIN        21
@@ -285,10 +285,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__
 /* 
@@ -359,6 +363,9 @@ static inline kernel_cap_t cap_invert(kernel_cap_t c)
 
 #define cap_is_fs_cap(c)     (CAP_TO_MASK(c) & CAP_FS_MASK)
 
+int capable(int cap);
+int __capable(struct task_struct *t, int cap);
+
 #endif /* __KERNEL__ */
 
 #endif /* !_LINUX_CAPABILITY_H */