diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-15 16:28:15 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-15 16:28:15 +1000 |
| commit | 30c26fe6b5e3f6bb3c3f26e87b56bb5e33474552 (patch) | |
| tree | 8cb5570bd00e01546675dd55e13ee319e2f1b766 | |
| parent | 253c7731a8bedcec1cbd130beb2eec9d2d142e77 (diff) | |
| parent | d0f702e648dc365070f1868ec291264ad27e65d8 (diff) | |
Merge remote-tracking branch 'cgroup/for-next'
| -rw-r--r-- | kernel/cgroup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 469dd547770c..cfa27f968e6f 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -261,7 +261,7 @@ static struct cgroup_subsys_state *cgroup_css(struct cgroup *cgrp, * @cgrp: the cgroup of interest * @ss: the subsystem of interest (%NULL returns @cgrp->self) * - * Similar to cgroup_css() but returns the effctive css, which is defined + * Similar to cgroup_css() but returns the effective css, which is defined * as the matching css of the nearest ancestor including self which has @ss * enabled. If @ss is associated with the hierarchy @cgrp is on, this * function is guaranteed to return non-NULL css. @@ -882,7 +882,7 @@ static void cgroup_exit_root_id(struct cgroup_root *root) static void cgroup_free_root(struct cgroup_root *root) { if (root) { - /* hierarhcy ID shoulid already have been released */ + /* hierarchy ID should already have been released */ WARN_ON_ONCE(root->hierarchy_id); idr_destroy(&root->cgroup_idr); |