Merge branch 'topic/monotonic' into for-next

1 files changed, 2 insertions, 4 deletions

diff --git a/kernel/power/main.c b/kernel/power/main.c
index 573410d6647e..8e90f330f139 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -300,13 +300,11 @@ static ssize_t state_show(struct kobject *kobj, struct kobj_attribute *attr,
                         s += sprintf(s,"%s ", pm_states[i].label);
 
 #endif
-#ifdef CONFIG_HIBERNATION
-        s += sprintf(s, "%s\n", "disk");
-#else
+        if (hibernation_available())
+                s += sprintf(s, "disk ");
         if (s != buf)
                 /* convert the last space to a newline */
                 *(s-1) = '\n';
-#endif
         return (s - buf);
 }