diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-08-29 00:15:47 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-08-29 00:15:47 +0200 |
| commit | cba630b6f5cf6bb468f5c2da77f3dee2125bd0c1 (patch) | |
| tree | fa2197409bddcf6faaf084cb64895f4c531bfa73 /kernel/power/power.h | |
| parent | 0c0b6b7bc427caed77b172916edc3c36cd1ab79d (diff) | |
| parent | 726fb6b4f2a82a14a906f39bdabac4863b87c01a (diff) | |
| download | linux-cba630b6f5cf6bb468f5c2da77f3dee2125bd0c1.tar.bz2 | |
Merge branch 'pm-sleep' into pm-docs
Diffstat (limited to 'kernel/power/power.h')
| -rw-r--r-- | kernel/power/power.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/power/power.h b/kernel/power/power.h index 7fdc40d31b7d..1d2d761e3c25 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -192,7 +192,6 @@ extern void swsusp_show_speed(ktime_t, ktime_t, unsigned int, char *); extern const char * const pm_labels[]; extern const char *pm_states[]; extern const char *mem_sleep_states[]; -extern suspend_state_t mem_sleep_current; extern int suspend_devices_and_enter(suspend_state_t state); #else /* !CONFIG_SUSPEND */ @@ -245,7 +244,11 @@ enum { #define TEST_FIRST TEST_NONE #define TEST_MAX (__TEST_AFTER_LAST - 1) +#ifdef CONFIG_PM_SLEEP_DEBUG extern int pm_test_level; +#else +#define pm_test_level (TEST_NONE) +#endif #ifdef CONFIG_SUSPEND_FREEZER static inline int suspend_freeze_processes(void) |