2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Rafael J. Wysocki <[email protected]> [ upstream commit 266f1a25eff5ff98c498d7754a419aacfd88f71c ] One comment in hibernate_preallocate_memory() is wrong, so fix it and add one more comment to clarify the meaning of the fixed one. Signed-off-by: Rafael J. Wysocki <[email protected]> Signed-off-by: Andi Kleen <[email protected]> --- kernel/power/snapshot.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) Index: linux-2.6.35.y/kernel/power/snapshot.c =================================================================== --- linux-2.6.35.y.orig/kernel/power/snapshot.c 2011-03-29 23:03:00.951275828 -0700 +++ linux-2.6.35.y/kernel/power/snapshot.c 2011-03-29 23:53:44.143408156 -0700 @@ -1318,12 +1318,14 @@ /* 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); _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
