[kernel] r16187 - in dists/trunk/linux-2.6/debian: . config

[Ben Hutchings]

Author: benh
Date: Fri Aug 27 04:24:38 2010
New Revision: 16187

Log:
Change BLK_CGROUP from module to built-in

so that cfq can be the default I/O scheduler again (Closes: #593720)

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Fri Aug 27 02:41:21 2010	(r16186)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Aug 27 04:24:38 2010	(r16187)
@@ -14,6 +14,8 @@
     - German (Holger Wansing) (Closes: #592226)
   * [x86] Enable samsung-laptop driver
   * [sparc] Enable XVR1000 driver (Closes: #574243)
+  * Change BLK_CGROUP from module to built-in so that cfq can be the
+    default I/O scheduler again (Closes: #593720)
 
   [ Ian Campbell ]
   * Fixes/overrides for Linitan warnings:

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Fri Aug 27 02:41:21 2010	(r16186)
+++ dists/trunk/linux-2.6/debian/config/config	Fri Aug 27 04:24:38 2010	(r16187)
@@ -3361,7 +3361,7 @@
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 # CONFIG_RESOURCE_COUNTERS is not set
-CONFIG_BLK_CGROUP=m
+CONFIG_BLK_CGROUP=y
 # CONFIG_DEBUG_BLK_CGROUP is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 CONFIG_RELAY=y