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

Commit 66d0ae4d authored by Jiri Slaby's avatar Jiri Slaby Committed by Rafael J. Wysocki
Browse files

PM / Hibernate: Swap, use KERN_CONT 



Use KERN_CONT in save_image() for printks, so that anybody won't
try to add a loglevel.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 8e60c6a1

kernel/power/swap.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -437,7 +437,7 @@ static int save_image(struct swap_map_handle *handle, 
		if (ret)

		if (ret)

			break;

			break;

		if (!(nr_pages % m))

		if (!(nr_pages % m))

			printk("\b\b\b\b%3d%%", nr_pages / m);

			printk(KERN_CONT "\b\b\b\b%3d%%", nr_pages / m);

		nr_pages++;

		nr_pages++;

	}

	}

	err2 = wait_on_bio_chain(&bio);

	err2 = wait_on_bio_chain(&bio);
@@ -445,9 +445,9 @@ static int save_image(struct swap_map_handle *handle, 
	if (!ret)

	if (!ret)

		ret = err2;

		ret = err2;

	if (!ret)

	if (!ret)

		printk("\b\b\b\bdone\n");

		printk(KERN_CONT "\b\b\b\bdone\n");

	else

	else

		printk("\n");

		printk(KERN_CONT "\n");

	swsusp_show_speed(&start, &stop, nr_to_write, "Wrote");

	swsusp_show_speed(&start, &stop, nr_to_write, "Wrote");

	return ret;

	return ret;

}

}