diff --git a/[refs] b/[refs]
index 9894b7b5e95c..29ce31538173 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fc0b02544b3b9bd3db5a8156b5f3e7350f8e797
+refs/heads/master: 80f4c87774721e864d5a5a1f7aca3e95fd90e194
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
index 95e9f3fdb729..2bfc78f531b6 100644
--- a/trunk/kernel/cgroup.c
+++ b/trunk/kernel/cgroup.c
@@ -92,7 +92,7 @@ static DEFINE_MUTEX(cgroup_root_mutex);
  * registered after that. The mutable section of this array is protected by
  * cgroup_mutex.
  */
-#define SUBSYS(_x) &_x ## _subsys,
+#define SUBSYS(_x) [_x ## _subsys_id] = &_x ## _subsys,
 #define IS_SUBSYS_ENABLED(option) IS_BUILTIN(option)
 static struct cgroup_subsys *subsys[CGROUP_SUBSYS_COUNT] = {
 #include <linux/cgroup_subsys.h>