diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-04-17 13:40:43 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-04-17 13:40:43 +0800 |
| commit | 26fb95cac56be1885787cfc69881d906f4814c46 (patch) | |
| tree | c6f0f9fdb95a0ba6bd2bdd354adcd622493c8e26 /include | |
| parent | b674d6ecd467c91c826536240ee6863d13ff83c0 (diff) | |
| parent | 146f542aac2cc725aa32f51b354eba5ece7ae08b (diff) | |
Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-android
Remove conflictsed drivers/staging/android/logger.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cgroup.h | 5 | ||||
| -rw-r--r-- | include/linux/lsm_audit.h | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index a6fc777288ab..a3997d560114 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -903,11 +903,6 @@ static inline int cgroup_attach_task_all(struct task_struct *from, return 0; } -static inline int subsys_cgroup_allow_attach(struct cgroup *cgrp, - struct cgroup_taskset *tset) -{ - return 0; -} #endif /* !CONFIG_CGROUPS */ #endif /* _LINUX_CGROUP_H */ diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h index 1cc89e9df480..ffb9c9da4f39 100644 --- a/include/linux/lsm_audit.h +++ b/include/linux/lsm_audit.h @@ -40,6 +40,11 @@ struct lsm_network_audit { } fam; }; +struct lsm_ioctlop_audit { + struct path path; + u16 cmd; +}; + /* Auxiliary data to use in generating the audit record. */ struct common_audit_data { char type; @@ -53,6 +58,7 @@ struct common_audit_data { #define LSM_AUDIT_DATA_KMOD 8 #define LSM_AUDIT_DATA_INODE 9 #define LSM_AUDIT_DATA_DENTRY 10 +#define LSM_AUDIT_DATA_IOCTL_OP 11 union { struct path path; struct dentry *dentry; @@ -68,6 +74,7 @@ struct common_audit_data { } key_struct; #endif char *kmod_name; + struct lsm_ioctlop_audit *op; } u; /* this union contains LSM specific data */ union { |