summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung.kim@lge.com>2012-01-19 23:23:10 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2012-01-19 23:23:10 +0100
commit160cb5a97daef0cb894685d84c9d4700bb7cccb4 (patch)
tree91b8fd151fad423572a686ee94295a84754c0347 /kernel/power
parent5eb6f9ad96967be4e0da55521a253e11b534bd3f (diff)
downloadlinux-stable-160cb5a97daef0cb894685d84c9d4700bb7cccb4.tar.gz
linux-stable-160cb5a97daef0cb894685d84c9d4700bb7cccb4.tar.bz2
linux-stable-160cb5a97daef0cb894685d84c9d4700bb7cccb4.zip
PM / Hibernate: Correct additional pages number calculation
The struct bm_block is allocated by chain_alloc(), so it'd better counting it in LINKED_PAGE_DATA_SIZE. Signed-off-by: Namhyung Kim <namhyung.kim@lge.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/snapshot.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 1cf88900ec4f..6a768e537001 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -812,7 +812,8 @@ unsigned int snapshot_additional_pages(struct zone *zone)
unsigned int res;
res = DIV_ROUND_UP(zone->spanned_pages, BM_BITS_PER_BLOCK);
- res += DIV_ROUND_UP(res * sizeof(struct bm_block), PAGE_SIZE);
+ res += DIV_ROUND_UP(res * sizeof(struct bm_block),
+ LINKED_PAGE_DATA_SIZE);
return 2 * res;
}