diff options
| author | Clark Williams <williams@redhat.com> | 2012-01-16 13:03:35 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-01-16 13:03:35 -0600 |
| commit | 40a54e2e116950a27dbd0a46a7b1ff8e982de477 (patch) | |
| tree | 70b9106eb01e81abbdb78485f32a521c5d3cb0a5 /kernel | |
| parent | 3d61884faa7b609f470fe0dd7b5b1ddeea5b3d5c (diff) | |
| parent | b8ed9e5b8c34dc9fb1882669e45b21e3d0194881 (diff) | |
Merge commit 'v3.2.1' into rt-3.2.1-rt10
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cgroup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index a184470cf9b5..cdc0354c5e6a 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -1175,10 +1175,10 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts) /* * If the 'all' option was specified select all the subsystems, - * otherwise 'all, 'none' and a subsystem name options were not - * specified, let's default to 'all' + * otherwise if 'none', 'name=' and a subsystem name options + * were not specified, let's default to 'all' */ - if (all_ss || (!all_ss && !one_ss && !opts->none)) { + if (all_ss || (!one_ss && !opts->none && !opts->name)) { for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) { struct cgroup_subsys *ss = subsys[i]; if (ss == NULL) |