---

yaml --- r: 366102 b: refs/heads/master c: 479f614 h: refs/heads/master v: v3
git-mirror · Apr 10, 2013 · 2ba9ae1 · 2ba9ae1
1 parent 91f84d8
commit 2ba9ae1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2b0ae25fc8bfeeb4022b8e847ab811b3c8368d1
+refs/heads/master: 479f614110b889d5783acdaec865ede3cdb96b97
diff --git a/trunk/include/linux/cgroup.h b/trunk/include/linux/cgroup.h
@@ -458,7 +458,6 @@ struct cgroup_subsys {
 	void (*bind)(struct cgroup *root);
 
 	int subsys_id;
-	int active;
 	int disabled;
 	int early_init;
 	/*

diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
@@ -4468,7 +4468,6 @@ static void __init cgroup_init_subsys(struct cgroup_subsys *ss)
 	 * need to invoke fork callbacks here. */
 	BUG_ON(!list_empty(&init_task.tasks));
 
-	ss->active = 1;
 	BUG_ON(online_css(ss, dummytop));
 
 	mutex_unlock(&cgroup_mutex);
@@ -4573,7 +4572,6 @@ int __init_or_module cgroup_load_subsys(struct cgroup_subsys *ss)
 	}
 	write_unlock(&css_set_lock);
 
-	ss->active = 1;
 	ret = online_css(ss, dummytop);
 	if (ret)
 		goto err_unload;
@@ -4614,7 +4612,6 @@ void cgroup_unload_subsys(struct cgroup_subsys *ss)
 	mutex_lock(&cgroup_mutex);
 
 	offline_css(ss, dummytop);
-	ss->active = 0;
 
 	if (ss->use_id)
 		idr_destroy(&ss->idr);