Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 223b734abccdc3b7f3baae457261dd66862fcd1d..2655abb8f310318b39565a08dea727186747daf5 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -529,7 +529,6 @@ config SRCU
 config TASKS_RCU
        bool
        default n
-       depends on !UML
        select SRCU
        help
          This option enables a task-based RCU implementation that uses
@@ -781,19 +780,6 @@ config RCU_NOCB_CPU_ALL
 
 endchoice
 
-config RCU_EXPEDITE_BOOT
-       bool
-       default n
-       help
-         This option enables expedited grace periods at boot time,
-         as if rcu_expedite_gp() had been invoked early in boot.
-         The corresponding rcu_unexpedite_gp() is invoked from
-         rcu_end_inkernel_boot(), which is intended to be invoked
-         at the end of the kernel-only boot sequence, just before
-         init is exec'ed.
-
-         Accept the default if unsure.
-
 endmenu # "RCU Subsystem"
 
 config BUILD_BIN2C
@@ -1176,6 +1162,10 @@ config CGROUP_DEBUG
 
          Say N.
 
+config SOCK_CGROUP_DATA
+       bool
+       default n
+
 endif # CGROUPS
 
 config CHECKPOINT_RESTORE
@@ -1983,6 +1973,10 @@ config MODVERSIONS
          make them incompatible with the kernel you are running.  If
          unsure, say N.
 
+config MODULE_REL_CRCS
+       bool
+       depends on MODVERSIONS
+
 config MODULE_SRCVERSION_ALL
        bool "Source checksum for all modules"
        help