Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[pandora-kernel.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 5fe94b8..cb64c58 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -76,6 +76,14 @@ config INIT_ENV_ARG_LIMIT
          variables passed to init from the kernel command line.
 
 
+config CROSS_COMPILE
+       string "Cross-compiler tool prefix"
+       help
+         Same as running 'make CROSS_COMPILE=prefix-' but stored for
+         default make runs in this kernel build directory.  You don't
+         need to set this unless you want the configured kernel build
+         directory to select the cross-compiler automatically.
+
 config LOCALVERSION
        string "Local version - append to kernel release"
        help
@@ -611,6 +619,33 @@ config RT_GROUP_SCHED
 
 endif #CGROUP_SCHED
 
+config BLK_CGROUP
+       tristate "Block IO controller"
+       depends on CGROUPS && BLOCK
+       default n
+       ---help---
+       Generic block IO controller cgroup interface. This is the common
+       cgroup interface which should be used by various IO controlling
+       policies.
+
+       Currently, CFQ IO scheduler uses it to recognize task groups and
+       control disk bandwidth allocation (proportional time slice allocation)
+       to such task groups.
+
+       This option only enables generic Block IO controller infrastructure.
+       One needs to also enable actual IO controlling logic in CFQ for it
+       to take effect. (CONFIG_CFQ_GROUP_IOSCHED=y).
+
+       See Documentation/cgroups/blkio-controller.txt for more information.
+
+config DEBUG_BLK_CGROUP
+       bool "Enable Block IO controller debugging"
+       depends on BLK_CGROUP
+       default n
+       ---help---
+       Enable some debugging help. Currently it exports additional stat
+       files in a cgroup which can be useful for debugging.
+
 endif # CGROUPS
 
 config MM_OWNER
@@ -1108,30 +1143,6 @@ config TRACEPOINTS
 
 source "arch/Kconfig"
 
-config SLOW_WORK
-       default n
-       bool
-       help
-         The slow work thread pool provides a number of dynamically allocated
-         threads that can be used by the kernel to perform operations that
-         take a relatively long time.
-
-         An example of this would be CacheFiles doing a path lookup followed
-         by a series of mkdirs and a create call, all of which have to touch
-         disk.
-
-         See Documentation/slow-work.txt.
-
-config SLOW_WORK_DEBUG
-       bool "Slow work debugging through debugfs"
-       default n
-       depends on SLOW_WORK && DEBUG_FS
-       help
-         Display the contents of the slow work run queue through debugfs,
-         including items currently executing.
-
-         See Documentation/slow-work.txt.
-
 endmenu                # General setup
 
 config HAVE_GENERIC_DMA_COHERENT