From e5c78278cc0b6f0a0216c1c2272ffb463ca17952 Mon Sep 17 00:00:00 2001
From: Daniel Wagner <daniel.wagner@bmw-carit.de>
Date: Wed, 12 Sep 2012 16:12:06 +0200
Subject: [PATCH] --- yaml --- r: 327211 b: refs/heads/master c:
 80f4c87774721e864d5a5a1f7aca3e95fd90e194 h: refs/heads/master i:   327209:
 ca8fe542044a3cc4943f86b0a1d46c5415801b30   327207:
 a0b79f2296da47db9b9a6680d807df2e403cadac v: v3

---
 [refs]                | 2 +-
 trunk/kernel/cgroup.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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>