Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0245b3e7 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Linus Torvalds
Browse files

[PATCH] swsusp: two simplifications 



The following patch simplifies the progress meter in disk.c:free_some_memory()
and makes disk.c:pm_suspend_disk() call device_resume() explicitly in the
suspend path.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2e32a43e

kernel/power/disk.c

+2 −6
Original line number Diff line number Diff line
@@ -92,10 +92,7 @@ static void free_some_memory(void) 
	printk("Freeing memory...  ");

	while ((tmp = shrink_all_memory(10000))) {

		pages += tmp;

		printk("\b%c", p[i]);

		i++;

		if (i > 3)

			i = 0;

		printk("\b%c", p[i++ % 4]);

	}

	printk("\bdone (%li pages freed)\n", pages);

}
@@ -177,13 +174,12 @@ int pm_suspend_disk(void) 
		goto Done;



	if (in_suspend) {

		device_resume();

		pr_debug("PM: writing image.\n");

		error = swsusp_write();

		if (!error)

			power_down(pm_disk_mode);

		else {

		/* swsusp_write can not fail in device_resume,

		   no need to do second device_resume */

			swsusp_free();

			unprepare_processes();

			return error;

kernel/power/swsusp.c

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ int enough_swap(unsigned nr_pages) 
int swsusp_write(void)

{

	int error;

	device_resume();



	lock_swapdevices();

	error = write_suspend_image();

	/* This will unlock ignored swap devices since writing is finished */