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 2322df701519ebfa9002f2e140ceedca4bd15be4..40ca0101bdccd52b7a0087450b68593cfa6a477a 100644 (file)
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -445,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);