Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-02-22 16:22:25 +0100
committerJiri Kosina <jkosina@suse.cz>2010-02-22 16:22:25 +0100
commitbf52f33ed1992c408c378ba6cc0fc9c45c86bb04 (patch)
tree64d43c3222fd723e05ec3e60f730ac4a71f6d3cd
parentd93ed0029fe28507eb27a09fefea8d54d7d56b37 (diff)
parent9884cb2355bb9751fa4c7fa3141d69e076332777 (diff)
Merge branch 'SLE11-SP1' of kerncvs.suse.de:/home/git/kernel-source into SLE11-SP1
Conflicts: kernel-source.changes
-rw-r--r--kernel-source.changes6
-rw-r--r--patches.suse/cgroup-disable-memory.patch79
-rw-r--r--series.conf5
3 files changed, 6 insertions, 84 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 74e7c5a4a7..c324481065 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -5,6 +5,12 @@ Mon Feb 22 16:13:47 CET 2010 - jkosina@suse.cz
turn 'low_latency' knob off by default (bnc#572834).
-------------------------------------------------------------------
+Mon Feb 22 16:03:05 CET 2010 - jbenc@suse.cz
+
+- patches.suse/cgroup-disable-memory.patch: Delete, the rest of the
+ patch does not make sense after commit 6b53b611.
+
+-------------------------------------------------------------------
Mon Feb 22 14:08:36 CET 2010 - tonyj@suse.de
- delete lttng instrumentation patches (requested by jkosina)
diff --git a/patches.suse/cgroup-disable-memory.patch b/patches.suse/cgroup-disable-memory.patch
deleted file mode 100644
index 85f3a81bd6..0000000000
--- a/patches.suse/cgroup-disable-memory.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From: Balbir Singh <balbir@linux.vnet.ibm.com>
-Date: Thu, 01 May 2008 02:48:58 -0700
-Subject: memcg: disable the memory controller by default
-References: bnc#436025 bnc#467688 bnc#550906
-Patch-mainline: never
-
-Due to the overhead of the memory controller the memory controller is now
-disabled by default. This patch adds cgroup_enable.
-
-[akpm@linux-foundation.org: `inline __init' doesn't make sense]
-Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
-Cc: AMAMOTO Takashi <yamamoto@valinux.co.jp>
-Acked-by: Paul Menage <menage@google.com>
-Cc: Pavel Emelianov <xemul@openvz.org>
-Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
-Cc: <stable@kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
----
-
- Documentation/kernel-parameters.txt | 3 +++
- kernel/cgroup.c | 17 +++++++++++++----
- 2 files changed, 16 insertions(+), 4 deletions(-)
-
---- a/Documentation/kernel-parameters.txt
-+++ b/Documentation/kernel-parameters.txt
-@@ -429,8 +429,11 @@ and is between 256 and 4096 characters.
- 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" }
---- a/kernel/cgroup.c
-+++ b/kernel/cgroup.c
-@@ -3791,7 +3791,7 @@ static void cgroup_release_agent(struct
- mutex_unlock(&cgroup_mutex);
- }
-
--static int __init cgroup_disable(char *str)
-+static int __init cgroup_turnonoff(char *str, int disable)
- {
- int i;
- char *token;
-@@ -3804,17 +3804,26 @@ static int __init cgroup_disable(char *s
- struct cgroup_subsys *ss = subsys[i];
-
- if (!strcmp(token, ss->name)) {
-- ss->disabled = 1;
-- printk(KERN_INFO "Disabling %s control group"
-- " subsystem\n", ss->name);
-+ ss->disabled = disable;
- 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.
- */
diff --git a/series.conf b/series.conf
index c24c45da7c..949eac7dd8 100644
--- a/series.conf
+++ b/series.conf
@@ -1339,11 +1339,6 @@
patches.suse/kdump-dump_after_notifier.patch
########################################################
- # cgroups
- ########################################################
- patches.suse/cgroup-disable-memory.patch
-
- ########################################################
# audit subsystem
########################################################
patches.suse/audit-export-logging.patch