From patchwork Fri Mar 18 16:25:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/2] PM / Hibernate: Improve comments in hibernate_preallocate_memory() Date: Fri, 18 Mar 2011 06:25:46 -0000 From: Manoj Iyer X-Patchwork-Id: 87551 Message-Id: <1300465546-4137-2-git-send-email-manoj.iyer@canonical.com> To: kernel-team@lists.ubuntu.com From: Rafael J. Wysocki 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 (cherry picked from commit 266f1a25eff5ff98c498d7754a419aacfd88f71c) Signed-off-by: Manoj Iyer Acked-by: Stefan Bader --- 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);