diff options
-rw-r--r-- | include/linux/cgroup.h | 1 | ||||
-rw-r--r-- | kernel/cgroup.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 900af5964f55..95c02c0e35b3 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h | |||
@@ -458,7 +458,6 @@ struct cgroup_subsys { | |||
458 | void (*bind)(struct cgroup *root); | 458 | void (*bind)(struct cgroup *root); |
459 | 459 | ||
460 | int subsys_id; | 460 | int subsys_id; |
461 | int active; | ||
462 | int disabled; | 461 | int disabled; |
463 | int early_init; | 462 | int early_init; |
464 | /* | 463 | /* |
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index a32f9432666c..5c462813722d 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
@@ -4468,7 +4468,6 @@ static void __init cgroup_init_subsys(struct cgroup_subsys *ss) | |||
4468 | * need to invoke fork callbacks here. */ | 4468 | * need to invoke fork callbacks here. */ |
4469 | BUG_ON(!list_empty(&init_task.tasks)); | 4469 | BUG_ON(!list_empty(&init_task.tasks)); |
4470 | 4470 | ||
4471 | ss->active = 1; | ||
4472 | BUG_ON(online_css(ss, dummytop)); | 4471 | BUG_ON(online_css(ss, dummytop)); |
4473 | 4472 | ||
4474 | mutex_unlock(&cgroup_mutex); | 4473 | mutex_unlock(&cgroup_mutex); |
@@ -4573,7 +4572,6 @@ int __init_or_module cgroup_load_subsys(struct cgroup_subsys *ss) | |||
4573 | } | 4572 | } |
4574 | write_unlock(&css_set_lock); | 4573 | write_unlock(&css_set_lock); |
4575 | 4574 | ||
4576 | ss->active = 1; | ||
4577 | ret = online_css(ss, dummytop); | 4575 | ret = online_css(ss, dummytop); |
4578 | if (ret) | 4576 | if (ret) |
4579 | goto err_unload; | 4577 | goto err_unload; |
@@ -4614,7 +4612,6 @@ void cgroup_unload_subsys(struct cgroup_subsys *ss) | |||
4614 | mutex_lock(&cgroup_mutex); | 4612 | mutex_lock(&cgroup_mutex); |
4615 | 4613 | ||
4616 | offline_css(ss, dummytop); | 4614 | offline_css(ss, dummytop); |
4617 | ss->active = 0; | ||
4618 | 4615 | ||
4619 | if (ss->use_id) | 4616 | if (ss->use_id) |
4620 | idr_destroy(&ss->idr); | 4617 | idr_destroy(&ss->idr); |