diff options
Diffstat (limited to 'include/uapi/linux/capability.h')
| -rw-r--r-- | include/uapi/linux/capability.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/uapi/linux/capability.h b/include/uapi/linux/capability.h index ba478fa3012e..251ce74f2880 100644 --- a/include/uapi/linux/capability.h +++ b/include/uapi/linux/capability.h @@ -10,8 +10,8 @@ * ftp://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/ */ -#ifndef _UAPI_LINUX_CAPABILITY_H -#define _UAPI_LINUX_CAPABILITY_H +#ifndef _LINUX_CAPABILITY_H +#define _LINUX_CAPABILITY_H #include <linux/types.h> @@ -40,13 +40,13 @@ struct task_struct; typedef struct __user_cap_header_struct { __u32 version; int pid; -} __user *cap_user_header_t; +} *cap_user_header_t; typedef struct __user_cap_data_struct { __u32 effective; __u32 permitted; __u32 inheritable; -} __user *cap_user_data_t; +} *cap_user_data_t; #define VFS_CAP_REVISION_MASK 0xFF000000 @@ -74,7 +74,6 @@ struct vfs_cap_data { } data[VFS_CAP_U32]; }; -#ifndef __KERNEL__ /* * Backwardly compatible definition for source code - trapped in a @@ -84,7 +83,6 @@ struct vfs_cap_data { #define _LINUX_CAPABILITY_VERSION _LINUX_CAPABILITY_VERSION_1 #define _LINUX_CAPABILITY_U32S _LINUX_CAPABILITY_U32S_1 -#endif /** @@ -355,4 +353,4 @@ struct vfs_cap_data { #define CAP_TO_MASK(x) (1 << ((x) & 31)) /* mask for indexed __u32 */ -#endif /* _UAPI_LINUX_CAPABILITY_H */ +#endif /* _LINUX_CAPABILITY_H */ |