From 1f58a2589592597873dce0617aedecdf48548eea Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Mon, 20 Sep 2010 19:44:38 +0200 Subject: [PATCH] --- yaml --- r: 212361 b: refs/heads/master c: 266f1a25eff5ff98c498d7754a419aacfd88f71c h: refs/heads/master i: 212359: a3d7414f39e7f7308b7ef66949281d394b71823c v: v3 --- [refs] | 2 +- trunk/kernel/power/snapshot.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e12bd5306a17..8da08211c46e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bcb5ba8b4e8a5ae14b27351bdf499dd4c3bcc944 +refs/heads/master: 266f1a25eff5ff98c498d7754a419aacfd88f71c diff --git a/trunk/kernel/power/snapshot.c b/trunk/kernel/power/snapshot.c index d3f795f01bbc..d9191b40cf6e 100644 --- a/trunk/kernel/power/snapshot.c +++ b/trunk/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);