FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Ubuntu > Ubuntu Kernel Team

 
 
LinkBack Thread Tools
 
Old 03-21-2011, 09:34 AM
Stefan Bader
 
Default PM / Hibernate: Improve comments in hibernate_preallocate_memory()

On 03/18/2011 05:25 PM, Manoj Iyer wrote:
> From: Rafael J. Wysocki <rjw@sisk.pl>
>
> One comment in hibernate_preallocate_memory() is wrong, so fix it and
> add one more comment to clarify the meaning of the fixed one.
>
> BugLink: http://launchpad.net/bugs/737208
>
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> (cherry picked from commit 266f1a25eff5ff98c498d7754a419aacfd88f71c)
>
> Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
> ---
> kernel/power/snapshot.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
> index 7fa52b5..703a057 100644
> --- a/kernel/power/snapshot.c
> +++ b/kernel/power/snapshot.c
> @@ -1318,12 +1318,14 @@ int hibernate_preallocate_memory(void)
>
> /* Compute the maximum number of saveable pages to leave in memory. */
> max_size = (count - (size + PAGES_FOR_IO)) / 2 - 2 * SPARE_PAGES;
> + /* Compute the desired number of image pages specified by image_size. */
> size = DIV_ROUND_UP(image_size, PAGE_SIZE);
> if (size > max_size)
> size = max_size;
> /*
> - * If the maximum is not less than the current number of saveable pages
> - * in memory, allocate page frames for the image and we're done.
> + * If the desired number of image pages is at least as large as the
> + * current number of saveable pages in memory, allocate page frames for
> + * the image and we're done.
> */
> if (size >= saveable) {
> pages = preallocate_image_highmem(save_highmem);

Cannot do any harm, so

Acked-by: Stefan Bader <stefan.bader@canonical.com>

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
 

Thread Tools




All times are GMT. The time now is 08:35 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org