projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'trace-4.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
[linux-2.6-microblaze.git]
/
kernel
/
power
/
suspend.c
diff --git
a/kernel/power/suspend.c
b/kernel/power/suspend.c
index
f67ceb7
..
15e6bae
100644
(file)
--- a/
kernel/power/suspend.c
+++ b/
kernel/power/suspend.c
@@
-46,7
+46,7
@@
static const char * const mem_sleep_labels[] = {
const char *mem_sleep_states[PM_SUSPEND_MAX];
suspend_state_t mem_sleep_current = PM_SUSPEND_FREEZE;
const char *mem_sleep_states[PM_SUSPEND_MAX];
suspend_state_t mem_sleep_current = PM_SUSPEND_FREEZE;
-s
uspend_state_t mem_sleep_default = PM_SUSPEND_MAX
;
+s
tatic suspend_state_t mem_sleep_default = PM_SUSPEND_MEM
;
unsigned int pm_suspend_global_flags;
EXPORT_SYMBOL_GPL(pm_suspend_global_flags);
unsigned int pm_suspend_global_flags;
EXPORT_SYMBOL_GPL(pm_suspend_global_flags);
@@
-168,7
+168,7
@@
void suspend_set_ops(const struct platform_suspend_ops *ops)
}
if (valid_state(PM_SUSPEND_MEM)) {
mem_sleep_states[PM_SUSPEND_MEM] = mem_sleep_labels[PM_SUSPEND_MEM];
}
if (valid_state(PM_SUSPEND_MEM)) {
mem_sleep_states[PM_SUSPEND_MEM] = mem_sleep_labels[PM_SUSPEND_MEM];
- if (mem_sleep_default
>
= PM_SUSPEND_MEM)
+ if (mem_sleep_default
=
= PM_SUSPEND_MEM)
mem_sleep_current = PM_SUSPEND_MEM;
}
mem_sleep_current = PM_SUSPEND_MEM;
}