[tip:sched/core] cgroup: Kill subsys.active flag

From: tip-bot for Li Zefan
Date: Wed Apr 10 2013 - 09:50:08 EST


Commit-ID: 479f614110b889d5783acdaec865ede3cdb96b97
Gitweb: http://git.kernel.org/tip/479f614110b889d5783acdaec865ede3cdb96b97
Author: Li Zefan <lizefan@xxxxxxxxxx>
AuthorDate: Fri, 29 Mar 2013 14:44:42 +0800
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Wed, 10 Apr 2013 13:54:22 +0200

cgroup: Kill subsys.active flag

The only user was cpuacct.

Acked-by: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: Li Zefan <lizefan@xxxxxxxxxx>
Acked-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/5155385A.4040207@xxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
include/linux/cgroup.h | 1 -
kernel/cgroup.c | 3 ---
2 files changed, 4 deletions(-)

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 900af59..95c02c0 100644
--- a/include/linux/cgroup.h
+++ b/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/kernel/cgroup.c b/kernel/cgroup.c
index a32f943..5c46281 100644
--- a/kernel/cgroup.c
+++ b/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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/