git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Linux 3.2.12
[pandora-kernel.git]
/
kernel
/
cgroup.c
diff --git
a/kernel/cgroup.c
b/kernel/cgroup.c
index
a184470
..
cdc0354
100644
(file)
--- 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,
/*
* 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->non
e)) {
+ if (all_ss || (!
one_ss && !opts->none && !opts->nam
e)) {
for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
struct cgroup_subsys *ss = subsys[i];
if (ss == NULL)
for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
struct cgroup_subsys *ss = subsys[i];
if (ss == NULL)