From 033494d88656a76cd68db3935d35172133ff918f Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Wed, 12 Sep 2012 16:12:08 +0200 Subject: [PATCH] --- yaml --- r: 327213 b: refs/heads/master c: a6f00298b2ceaf50b4ab00e6ee3eb0206ac72fac h: refs/heads/master i: 327211: e5c78278cc0b6f0a0216c1c2272ffb463ca17952 v: v3 --- [refs] | 2 +- trunk/include/linux/cgroup.h | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 32202d9bc904..7a48e3e43ee5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a8e04df4747661daaee77e98e102d99c9e09b98 +refs/heads/master: a6f00298b2ceaf50b4ab00e6ee3eb0206ac72fac diff --git a/trunk/include/linux/cgroup.h b/trunk/include/linux/cgroup.h index 018f819405c8..df354ae079c1 100644 --- a/trunk/include/linux/cgroup.h +++ b/trunk/include/linux/cgroup.h @@ -49,16 +49,10 @@ extern const struct file_operations proc_cgroup_operations; #define IS_SUBSYS_ENABLED(option) IS_ENABLED(option) enum cgroup_subsys_id { #include - __CGROUP_TEMPORARY_PLACEHOLDER + CGROUP_SUBSYS_COUNT, }; #undef IS_SUBSYS_ENABLED #undef SUBSYS -/* - * This define indicates the maximum number of subsystems that can be loaded - * at once. We limit to this many since cgroupfs_root has subsys_bits to keep - * track of all of them. - */ -#define CGROUP_SUBSYS_COUNT (BITS_PER_BYTE*sizeof(unsigned long)) /* Per-subsystem/per-cgroup state maintained by the system. */ struct cgroup_subsys_state {