Home| summaryrefslogtreecommitdiff |
| author | Jiri Kosina <jkosina@suse.cz> | 2010-02-22 15:22:25 (GMT) |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-02-22 15:22:25 (GMT) |
| commit | e97bc7baa25a89d176cdc7c854a8a83c8ee5ed54 (patch) (side-by-side diff) | |
| tree | f61ae805d69188139f69e93099346e514480380e | |
| parent | fd6d94bd9c0d2db227d817459b4e9b3a24535560 (diff) | |
| parent | c40b1eac5174efd98768f8ebbe7726a5a90a626a (diff) | |
Merge branch 'SLE11-SP1' of kerncvs.suse.de:/home/git/kernel-source into SLE11-SP1rpm-2.6.32.8-0.3
Conflicts:
kernel-source.changes
suse-commit: bf52f33ed1992c408c378ba6cc0fc9c45c86bb04
| -rw-r--r-- | Documentation/kernel-parameters.txt | 3 | ||||
| -rw-r--r-- | kernel/cgroup.c | 17 |
2 files changed, 4 insertions, 16 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index e23f8a1..6fff95f 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -429,11 +429,8 @@ and is between 256 and 4096 characters. It is defined in the file See Documentation/s390/CommonIO for details. cgroup_disable= [KNL] Disable a particular controller - cgroup_enable= [KNL] Enable a particular controller - For both cgroup_enable and cgroup_enable Format: {name of the controller(s) to disable} {Currently supported controllers - "memory"} - {Memory controller is disabled by default} checkreqprot [SELINUX] Set initial checkreqprot flag value. Format: { "0" | "1" } diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 5375988..1fbcc748 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -3791,7 +3791,7 @@ static void cgroup_release_agent(struct work_struct *work) mutex_unlock(&cgroup_mutex); } -static int __init cgroup_turnonoff(char *str, int disable) +static int __init cgroup_disable(char *str) { int i; char *token; @@ -3804,26 +3804,17 @@ static int __init cgroup_turnonoff(char *str, int disable) struct cgroup_subsys *ss = subsys[i]; if (!strcmp(token, ss->name)) { - ss->disabled = disable; + ss->disabled = 1; + printk(KERN_INFO "Disabling %s control group" + " subsystem\n", ss->name); break; } } } return 1; } - -static int __init cgroup_disable(char *str) -{ - return cgroup_turnonoff(str, 1); -} __setup("cgroup_disable=", cgroup_disable); -static int __init cgroup_enable(char *str) -{ - return cgroup_turnonoff(str, 0); -} -__setup("cgroup_enable=", cgroup_enable); - /* * Functons for CSS ID. */ |