PM: Reorder power management Kconfig options

Reorder configuration options in kernel/power/Kconfig so that
the options depended on are at the top of the list.

This patch doesn't introduce any functional changes.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index d739cf6..1e4d923 100644 (file)
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -1,89 +1,3 @@
-config PM
-       bool
-       depends on PM_SLEEP || PM_RUNTIME
-       default y
-
-config PM_DEBUG
-       bool "Power Management Debug Support"
-       depends on PM
-       ---help---
-       This option enables various debugging support in the Power Management
-       code. This is helpful when debugging and reporting PM bugs, like
-       suspend support.
-
-config PM_ADVANCED_DEBUG
-       bool "Extra PM attributes in sysfs for low-level debugging/testing"
-       depends on PM_DEBUG
-       default n
-       ---help---
-       Add extra sysfs attributes allowing one to access some Power Management
-       fields of device objects from user space.  If you are not a kernel
-       developer interested in debugging/testing Power Management, say "no".
-
-config PM_VERBOSE
-       bool "Verbose Power Management debugging"
-       depends on PM_DEBUG
-       default n
-       ---help---
-       This option enables verbose messages from the Power Management code.
-
-config CAN_PM_TRACE
-       def_bool y
-       depends on PM_DEBUG && PM_SLEEP && EXPERIMENTAL
-
-config PM_TRACE
-       bool
-       help
-         This enables code to save the last PM event point across
-         reboot. The architecture needs to support this, x86 for
-         example does by saving things in the RTC, see below.
-
-         The architecture specific code must provide the extern
-         functions from <linux/resume-trace.h> as well as the
-         <asm/resume-trace.h> header with a TRACE_RESUME() macro.
-
-         The way the information is presented is architecture-
-         dependent, x86 will print the information during a
-         late_initcall.
-
-config PM_TRACE_RTC
-       bool "Suspend/resume event tracing"
-       depends on CAN_PM_TRACE
-       depends on X86
-       select PM_TRACE
-       default n
-       ---help---
-       This enables some cheesy code to save the last PM event point in the
-       RTC across reboots, so that you can debug a machine that just hangs
-       during suspend (or more commonly, during resume).
-
-       To use this debugging feature you should attempt to suspend the
-       machine, reboot it and then run
-
-               dmesg -s 1000000 | grep 'hash matches'
-
-       CAUTION: this option will cause your machine's real-time clock to be
-       set to an invalid time after a resume.
-
-config PM_SLEEP_SMP
-       bool
-       depends on SMP
-       depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
-       depends on PM_SLEEP
-       select HOTPLUG
-       select HOTPLUG_CPU
-       default y
-
-config PM_SLEEP
-       bool
-       depends on SUSPEND || HIBERNATION || XEN_SAVE_RESTORE
-       default y
-
-config PM_SLEEP_ADVANCED_DEBUG
-       bool
-       depends on PM_ADVANCED_DEBUG
-       default n
-
 config SUSPEND
        bool "Suspend to RAM and standby"
        depends on ARCH_SUSPEND_POSSIBLE
@@ -93,17 +7,6 @@ config SUSPEND
          powered and thus its contents are preserved, such as the
          suspend-to-RAM state (e.g. the ACPI S3 state).
 
-config PM_TEST_SUSPEND
-       bool "Test suspend/resume and wakealarm during bootup"
-       depends on SUSPEND && PM_DEBUG && RTC_CLASS=y
-       ---help---
-       This option will let you suspend your machine during bootup, and
-       make it wake up a few seconds later using an RTC wakeup alarm.
-       Enable this with a kernel parameter like "test_suspend=mem".
-
-       You probably want to have your system's RTC driver statically
-       linked, ensuring that it's available when this test runs.
-
 config SUSPEND_FREEZER
        bool "Enable freezer for suspend to RAM/standby" \
                if ARCH_WANTS_FREEZER_CONTROL || BROKEN
@@ -180,6 +83,117 @@ config PM_STD_PARTITION
          suspended image to. It will simply pick the first available swap 
          device.
 
+config PM_SLEEP
+       bool
+       depends on SUSPEND || HIBERNATION || XEN_SAVE_RESTORE
+       default y
+
+config PM_SLEEP_SMP
+       bool
+       depends on SMP
+       depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
+       depends on PM_SLEEP
+       select HOTPLUG
+       select HOTPLUG_CPU
+       default y
+
+config PM_RUNTIME
+       bool "Run-time PM core functionality"
+       depends on !IA64_HP_SIM
+       ---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
+         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
+         wake-up events.
+
+config PM
+       bool
+       depends on PM_SLEEP || PM_RUNTIME
+       default y
+
+config PM_DEBUG
+       bool "Power Management Debug Support"
+       depends on PM
+       ---help---
+       This option enables various debugging support in the Power Management
+       code. This is helpful when debugging and reporting PM bugs, like
+       suspend support.
+
+config PM_VERBOSE
+       bool "Verbose Power Management debugging"
+       depends on PM_DEBUG
+       default n
+       ---help---
+       This option enables verbose messages from the Power Management code.
+
+config PM_ADVANCED_DEBUG
+       bool "Extra PM attributes in sysfs for low-level debugging/testing"
+       depends on PM_DEBUG
+       default n
+       ---help---
+       Add extra sysfs attributes allowing one to access some Power Management
+       fields of device objects from user space.  If you are not a kernel
+       developer interested in debugging/testing Power Management, say "no".
+
+config PM_SLEEP_ADVANCED_DEBUG
+       bool
+       depends on PM_ADVANCED_DEBUG
+       default n
+
+config PM_TEST_SUSPEND
+       bool "Test suspend/resume and wakealarm during bootup"
+       depends on SUSPEND && PM_DEBUG && RTC_CLASS=y
+       ---help---
+       This option will let you suspend your machine during bootup, and
+       make it wake up a few seconds later using an RTC wakeup alarm.
+       Enable this with a kernel parameter like "test_suspend=mem".
+
+       You probably want to have your system's RTC driver statically
+       linked, ensuring that it's available when this test runs.
+
+config CAN_PM_TRACE
+       def_bool y
+       depends on PM_DEBUG && PM_SLEEP && EXPERIMENTAL
+
+config PM_TRACE
+       bool
+       help
+         This enables code to save the last PM event point across
+         reboot. The architecture needs to support this, x86 for
+         example does by saving things in the RTC, see below.
+
+         The architecture specific code must provide the extern
+         functions from <linux/resume-trace.h> as well as the
+         <asm/resume-trace.h> header with a TRACE_RESUME() macro.
+
+         The way the information is presented is architecture-
+         dependent, x86 will print the information during a
+         late_initcall.
+
+config PM_TRACE_RTC
+       bool "Suspend/resume event tracing"
+       depends on CAN_PM_TRACE
+       depends on X86
+       select PM_TRACE
+       default n
+       ---help---
+       This enables some cheesy code to save the last PM event point in the
+       RTC across reboots, so that you can debug a machine that just hangs
+       during suspend (or more commonly, during resume).
+
+       To use this debugging feature you should attempt to suspend the
+       machine, reboot it and then run
+
+               dmesg -s 1000000 | grep 'hash matches'
+
+       CAUTION: this option will cause your machine's real-time clock to be
+       set to an invalid time after a resume.
+
 config APM_EMULATION
        tristate "Advanced Power Management Emulation"
        depends on PM && SYS_SUPPORTS_APM_EMULATION
@@ -206,20 +220,6 @@ config APM_EMULATION
          anything, try disabling/enabling this option (or disabling/enabling
          APM in your BIOS).
 
-config PM_RUNTIME
-       bool "Run-time PM core functionality"
-       depends on !IA64_HP_SIM
-       ---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
-         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
-         wake-up events.
-
 config PM_OPS
        bool
        depends on PM_SLEEP || PM_RUNTIME