Commit fccddb25 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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()
parents 58339fea 00bb3998

Documentation/power/states.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

kernel/power/suspend_test.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

kernel/power/swap.c

+1 −1
Original line number Diff line number Diff line
@@ -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));