diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-23 15:11:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-23 15:11:27 -0800 |
| commit | ac1e3d4f5c1097422c6e72aeae322033e9a8c803 (patch) | |
| tree | adcebdad5f515a8453bfe48940822f57a6904c9d /kernel | |
| parent | eaed435a7b870a38d89dbdb535c7842d618d3214 (diff) | |
| parent | e4c89a508f4385a0cd8681c2749a2cd2fa476e40 (diff) | |
| download | op-kernel-dev-ac1e3d4f5c1097422c6e72aeae322033e9a8c803.zip op-kernel-dev-ac1e3d4f5c1097422c6e72aeae322033e9a8c803.tar.gz | |
Merge tag 'pm-fixes-for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Power management fixes for 3.3
Two fixes for regressions introduced during the merge window, one fix for
a long-standing obscure issue in the computation of hibernate image size
and two small PM documentation fixes.
* tag 'pm-fixes-for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM / Sleep: Fix read_unlock_usermodehelper() call.
PM / Hibernate: Rewrite unlock_system_sleep() to fix s2disk regression
PM / Hibernate: Correct additional pages number calculation
PM / Documentation: Fix minor issue in freezing_of_tasks.txt
PM / Documentation: Fix spelling mistake in basic-pm-debugging.txt
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/snapshot.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 1cf8890..6a768e5 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; } |
