summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2010-02-25 22:32:37 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2010-02-26 20:39:13 +0100
commita9c9b4429df437982d2fbfab1f4b46b01329e9ed (patch)
tree0270bcf49069839e43b913e1fd718ca8fc7bd451 /kernel/power
parentf8bb0db8188c7ef9ef08515883dae9f9eb980984 (diff)
downloadop-kernel-dev-a9c9b4429df437982d2fbfab1f4b46b01329e9ed.zip
op-kernel-dev-a9c9b4429df437982d2fbfab1f4b46b01329e9ed.tar.gz
PM / Hibernate: Fix preallocating of memory
The hibernate memory preallocation code allocates memory to push some user space data out of physical RAM, so that the hibernation image is not too large. It allocates more memory than necessary for creating the image, so it has to release some pages to make room for allocations made while suspending devices and disabling nonboot CPUs, or the system will hang due to the lack of free pages to allocate from. Unfortunately, the function used for freeing these pages, free_unnecessary_pages(), contains a bug that prevents it from doing the job on all systems without highmem. Fix this problem, which is a regression from the 2.6.30 kernel, by using the right condition for the termination of the loop in free_unnecessary_pages(). Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Reported-and-tested-by: Alan Jenkins <sourcejedi.lkml@googlemail.com> Cc: stable@kernel.org
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/snapshot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 2eda407..830cade 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -1181,7 +1181,7 @@ static void free_unnecessary_pages(void)
memory_bm_position_reset(&copy_bm);
- while (to_free_normal > 0 && to_free_highmem > 0) {
+ while (to_free_normal > 0 || to_free_highmem > 0) {
unsigned long pfn = memory_bm_next_pfn(&copy_bm);
struct page *page = pfn_to_page(pfn);
OpenPOWER on IntegriCloud