Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y

[android-sdk/kernel-video.git] / include / linux / cgroup.h

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 7d73905dcba2166f91fd029518389ab0bbe66d1f..40ca0101bdccd52b7a0087450b68593cfa6a477a 100644 (file)
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -303,9 +303,6 @@ struct cftype {
        /* CFTYPE_* flags */
        unsigned int flags;
 
-       /* file xattrs */
-       struct simple_xattrs xattrs;
-
        int (*open)(struct inode *inode, struct file *file);
        ssize_t (*read)(struct cgroup *cgrp, struct cftype *cft,
                        struct file *file,
@@ -448,6 +445,7 @@ struct cgroup_subsys {
        void (*css_offline)(struct cgroup *cgrp);
        void (*css_free)(struct cgroup *cgrp);
 
+       int (*allow_attach)(struct cgroup *cgrp, struct cgroup_taskset *tset);
        int (*can_attach)(struct cgroup *cgrp, struct cgroup_taskset *tset);
        void (*cancel_attach)(struct cgroup *cgrp, struct cgroup_taskset *tset);
        void (*attach)(struct cgroup *cgrp, struct cgroup_taskset *tset);