Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...

[mv-sheeva.git] / include / linux / cgroup.h

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 028ba3b523b1b8a3a8cdeea0ad745552ae84a8cd..a6a6035a4e1ec16d1e27a3f2470fc316c476cd6a 100644 (file)
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -256,6 +256,7 @@ struct cgroup_subsys {
        void (*bind)(struct cgroup_subsys *ss, struct cgroup *root);
        int subsys_id;
        int active;
+       int disabled;
        int early_init;
 #define MAX_CGROUP_TYPE_NAMELEN 32
        const char *name;