Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-merged

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 3f42cd66f0f87a25510dd000aed37de5c0d5cc71..2acd917ebf2d1a1e4ce48ed288583d164a9dbfdf 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -438,15 +438,6 @@ config PREEMPT_RCU
          This option enables preemptible-RCU code that is common between
          the TREE_PREEMPT_RCU and TINY_PREEMPT_RCU implementations.
 
-config RCU_TRACE
-       bool "Enable tracing for RCU"
-       help
-         This option provides tracing in RCU which presents stats
-         in debugfs for debugging RCU implementation.
-
-         Say Y here if you want to enable RCU tracing
-         Say N if you are unsure.
-
 config RCU_FANOUT
        int "Tree-based hierarchical RCU fanout value"
        range 2 64 if 64BIT
@@ -766,7 +757,7 @@ config RT_GROUP_SCHED
 endif #CGROUP_SCHED
 
 config BLK_CGROUP
-       tristate "Block IO controller"
+       bool "Block IO controller"
        depends on BLOCK
        default n
        ---help---