rcu: Make SRCU optional by using CONFIG_SRCU

[mirror_ubuntu-zesty-kernel.git] / kernel / power / Kconfig

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 6e7708c2c21f9c7a4e3142a8100bf0aa3852a264..7e01f78f041778abe405c9115c15e10a77f64d03 100644 (file)
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -94,7 +94,7 @@ config PM_STD_PARTITION
 config PM_SLEEP
        def_bool y
        depends on SUSPEND || HIBERNATE_CALLBACKS
-       select PM_RUNTIME
+       select PM
 
 config PM_SLEEP_SMP
        def_bool y
@@ -130,23 +130,19 @@ config PM_WAKELOCKS_GC
        depends on PM_WAKELOCKS
        default y
 
-config PM_RUNTIME
-       bool "Run-time PM core functionality"
+config PM
+       bool "Device power management core functionality"
        ---help---
          Enable functionality allowing I/O devices to be put into energy-saving
-         (low power) states at run time (or autosuspended) after a specified
-         period of inactivity and woken up in response to a hardware-generated
+         (low power) states, for example after a specified period of inactivity
+         (autosuspended), and woken up in response to a hardware-generated
          wake-up event or a driver's request.
 
          Hardware support is generally required for this functionality to work
          and the bus type drivers of the buses the devices are on are
-         responsible for the actual handling of the autosuspend requests and
+         responsible for the actual handling of device suspend requests and
          wake-up events.
 
-config PM
-       def_bool y
-       depends on PM_SLEEP || PM_RUNTIME
-
 config PM_DEBUG
        bool "Power Management Debug Support"
        depends on PM
@@ -255,6 +251,7 @@ config APM_EMULATION
 
 config PM_OPP
        bool
+       select SRCU
        ---help---
          SOCs have a standard set of tuples consisting of frequency and
          voltage pairs that the device will support per voltage domain. This