diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-20 14:26:13 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-20 14:26:13 +0100 |
| commit | fccddb25e1ec96bd11cd0fc6aa097899a9a8b44b (patch) | |
| tree | fbd4f4d0f88a6972a7995fa60698766310069035 | |
| parent | Merge branches 'pm-core', 'pm-qos' and 'pm-domains' (diff) | |
| parent | PM / Documentation: Spelling s/wrtie/write/ (diff) | |
| download | linux-dev-fccddb25e1ec96bd11cd0fc6aa097899a9a8b44b.tar.xz linux-dev-fccddb25e1ec96bd11cd0fc6aa097899a9a8b44b.zip | |
Merge branch 'pm-sleep'
* 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()
| -rw-r--r-- | Documentation/power/states.txt | 2 | ||||
| -rw-r--r-- | kernel/power/suspend_test.c | 2 | ||||
| -rw-r--r-- | kernel/power/swap.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/power/states.txt b/Documentation/power/states.txt index 008ecb588317..bc4548245a24 100644 --- a/Documentation/power/states.txt +++ b/Documentation/power/states.txt @@ -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 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 -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 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 diff --git a/kernel/power/suspend_test.c b/kernel/power/suspend_test.c index bdff5ed57f10..5db217051232 100644 --- a/kernel/power/suspend_test.c +++ b/kernel/power/suspend_test.c @@ -166,7 +166,7 @@ static int __init setup_test_suspend(char *value) 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)) { test_state_label = pm_labels[i]; return 0; diff --git a/kernel/power/swap.c b/kernel/power/swap.c index 32e0c232efba..f80fd33639e0 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c @@ -201,7 +201,7 @@ void free_all_swap_pages(int swap) struct swsusp_extent *ext; unsigned long offset; - ext = container_of(node, struct swsusp_extent, node); + ext = rb_entry(node, struct swsusp_extent, node); rb_erase(node, &swsusp_extents); for (offset = ext->start; offset <= ext->end; offset++) swap_free(swp_entry(swap, offset)); |