rpms/kernel/devel config-generic, 1.266, 1.267 kernel.spec, 1.1486, 1.1487

[Dave Jones]

Author: davej

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

Modified Files:
	config-generic kernel.spec 
Log Message:
Make io schedulers selectable at boot time again. (#492817)


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- config-generic	26 Mar 2009 18:05:44 -0000	1.266
+++ config-generic	30 Mar 2009 19:26:07 -0000	1.267
@@ -40,8 +40,8 @@
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=m
-CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_CFQ=y
 CONFIG_USER_NS=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1486
retrieving revision 1.1487
diff -u -r1.1486 -r1.1487
--- kernel.spec	30 Mar 2009 19:23:08 -0000	1.1486
+++ kernel.spec	30 Mar 2009 19:26:07 -0000	1.1487
@@ -1854,7 +1854,10 @@
 # and build.
 
 %changelog
-* Mon Mar 30 2009 Dave Jones <davej at redhat.com> 2.6.29-24
+* Mon Mar 30 2009 Dave Jones <davej at redhat.com>
+- Make io schedulers selectable at boot time again. (#492817)
+
+* Mon Mar 30 2009 Dave Jones <davej at redhat.com>
 - Add a strict-devmem=0 boot argument (#492803)
 
 * Mon Mar 30 2009 Adam Jackson <ajax at redhat.com>