tracing: Have preempt(irqs)off trace preempt disabled functions

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / kernel / power / main.c

diff --git a/kernel/power/main.c b/kernel/power/main.c
index a387bfdc7b09e71943de366ffd1c213eeba836bd..312c1b2c725ddf4165a373c609f307679118a951 100644 (file)
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -296,7 +296,7 @@ static ssize_t state_show(struct kobject *kobj, struct kobj_attribute *attr,
        suspend_state_t i;
 
        for (i = PM_SUSPEND_MIN; i < PM_SUSPEND_MAX; i++)
-               if (valid_state(i))
+               if (pm_states[i].state)
                        s += sprintf(s,"%s ", pm_states[i].label);
 
 #endif
@@ -328,8 +328,9 @@ static suspend_state_t decode_state(const char *buf, size_t n)
 
 #ifdef CONFIG_SUSPEND
        for (s = &pm_states[state]; state < PM_SUSPEND_MAX; s++, state++)
-               if (len == strlen(s->label) && !strncmp(buf, s->label, len))
-                       return state;
+               if (s->state && len == strlen(s->label)
+                   && !strncmp(buf, s->label, len))
+                       return s->state;
 #endif
 
        return PM_SUSPEND_ON;
@@ -445,7 +446,7 @@ static ssize_t autosleep_show(struct kobject *kobj,
 
 #ifdef CONFIG_SUSPEND
        if (state < PM_SUSPEND_MAX)
-               return sprintf(buf, "%s\n", valid_state(state) ?
+               return sprintf(buf, "%s\n", pm_states[state].state ?
                                        pm_states[state].label : "error");
 #endif
 #ifdef CONFIG_HIBERNATION