PM / sleep: Put pm_test under CONFIG_PM_SLEEP_DEBUG

The pm_test sysfs attribute is under CONFIG_PM_DEBUG, but it doesn't
make sense to provide it if CONFIG_PM_SLEEP is unset, so put it under
CONFIG_PM_SLEEP_DEBUG instead.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/kernel/power/main.c b/kernel/power/main.c
index b7876eaf83f339879e711d81d96cf24001fbb282..3074ea4cec0a63e3b91c64761f67c7150b04f5dc 100644 (file)
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -150,7 +150,7 @@ static ssize_t mem_sleep_store(struct kobject *kobj, struct kobj_attribute *attr
 power_attr(mem_sleep);
 #endif /* CONFIG_SUSPEND */
 
-#ifdef CONFIG_PM_DEBUG
+#ifdef CONFIG_PM_SLEEP_DEBUG
 int pm_test_level = TEST_NONE;
 
 static const char * const pm_tests[__TEST_AFTER_LAST] = {
@@ -211,7 +211,7 @@ static ssize_t pm_test_store(struct kobject *kobj, struct kobj_attribute *attr,
 }
 
 power_attr(pm_test);
-#endif /* CONFIG_PM_DEBUG */
+#endif /* CONFIG_PM_SLEEP_DEBUG */
 
 #ifdef CONFIG_DEBUG_FS
 static char *suspend_step_name(enum suspend_stat_step step)
@@ -746,10 +746,8 @@ static struct attribute * g[] = {
        &wake_lock_attr.attr,
        &wake_unlock_attr.attr,
 #endif
-#ifdef CONFIG_PM_DEBUG
-       &pm_test_attr.attr,
-#endif
 #ifdef CONFIG_PM_SLEEP_DEBUG
+       &pm_test_attr.attr,
        &pm_print_times_attr.attr,
        &pm_wakeup_irq_attr.attr,
        &pm_debug_messages_attr.attr,

diff --git a/kernel/power/power.h b/kernel/power/power.h
index 6e3ac6a73d65ce6b1e36b4ffebf481564a5c2832..268c1b0afc289219c7f8d41a5f2c857ba253b3ca 100644 (file)
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -245,7 +245,7 @@ enum {
 #define TEST_FIRST     TEST_NONE
 #define TEST_MAX       (__TEST_AFTER_LAST - 1)
 
-#ifdef CONFIG_PM_DEBUG
+#ifdef CONFIG_PM_SLEEP_DEBUG
 extern int pm_test_level;
 #else
 #define pm_test_level  (TEST_NONE)