Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 05:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pm-sleep'

Browse Source 
* pm-sleep:
  PM / Documentation: Spelling s/wrtie/write/
  PM / sleep: Fix test_suspend after sleep state rework
  PM / Hibernate: Use rb_entry() instead of container_of()
This commit is contained in:
Rafael J. Wysocki 2017-02-20 14:26:13 +01:00
commit fccddb25e1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/power/states.txt
View File

@ -25,7 +25,7 @@ to be used subsequently to change to the one represented by that string.
Consequently, there are two ways to cause the system to go into the Consequently, there are two ways to cause the system to go into the
Suspend-To-Idle sleep state. The first one is to write "freeze" directly to Suspend-To-Idle sleep state. The first one is to write "freeze" directly to
/sys/power/state. The second one is to write "s2idle" to /sys/power/mem_sleep /sys/power/state. The second one is to write "s2idle" to /sys/power/mem_sleep
and then to wrtie "mem" to /sys/power/state. Similarly, there are two ways and then to write "mem" to /sys/power/state. Similarly, there are two ways
to cause the system to go into the Power-On Suspend sleep state (the strings to to cause the system to go into the Power-On Suspend sleep state (the strings to
write to the control files in that case are "standby" or "shallow" and "mem", write to the control files in that case are "standby" or "shallow" and "mem",
respectively) if that state is supported by the platform. In turn, there is respectively) if that state is supported by the platform. In turn, there is

2
kernel/power/suspend_test.c
View File

@ -166,7 +166,7 @@ static int __init setup_test_suspend(char *value)
return 0; return 0;
} }
for (i = 0; pm_labels[i]; i++) for (i = PM_SUSPEND_MIN; i < PM_SUSPEND_MAX; i++)
if (!strcmp(pm_labels[i], suspend_type)) { if (!strcmp(pm_labels[i], suspend_type)) {
test_state_label = pm_labels[i]; test_state_label = pm_labels[i];
return 0; return 0;

2
kernel/power/swap.c
View File

@ -201,7 +201,7 @@ void free_all_swap_pages(int swap)
struct swsusp_extent *ext; struct swsusp_extent *ext;
unsigned long offset; unsigned long offset;
ext = container_of(node, struct swsusp_extent, node); ext = rb_entry(node, struct swsusp_extent, node);
rb_erase(node, &swsusp_extents); rb_erase(node, &swsusp_extents);
for (offset = ext->start; offset <= ext->end; offset++) for (offset = ext->start; offset <= ext->end; offset++)
swap_free(swp_entry(swap, offset)); swap_free(swp_entry(swap, offset));