rpms/kernel/devel config-generic, 1.196, 1.197 kernel.spec, 1.1151, 1.1152

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17489

Modified Files:
	config-generic kernel.spec 
Log Message:
enable CONFIG_CGROUP_MEM_RES_CTLR.


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- config-generic	19 Nov 2008 13:51:43 -0000	1.196
+++ config-generic	8 Dec 2008 15:39:52 -0000	1.197
@@ -3378,8 +3378,7 @@
 CONFIG_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_SCHED=y
-# NOTE: Before changing the below, take notice that page struct will grow past a cacheline on 32bit.
-# CONFIG_CGROUP_MEM_RES_CTLR is not set
+CONFIG_CGROUP_MEM_RES_CTLR=y
 
 CONFIG_CPUSETS=y
 CONFIG_CGROUPS=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1151
retrieving revision 1.1152
diff -u -r1.1151 -r1.1152
--- kernel.spec	8 Dec 2008 04:49:57 -0000	1.1151
+++ kernel.spec	8 Dec 2008 15:39:52 -0000	1.1152
@@ -1910,6 +1910,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Dec 08 2008 Dave Jones <davej at redhat.com>
+- enable CONFIG_CGROUP_MEM_RES_CTLR.
+
 * Mon Dec 08 2008 Kyle McMartin <kyle at redhat.com>
 - execshield re-merge. xen bits shoved into execshield patch
   (they belong there...)