Commit 31cb8528 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM / Hibernate: Fix free_unnecessary_pages()
parents 2a9d6df4 4d4cf23c
...@@ -1211,7 +1211,11 @@ static void free_unnecessary_pages(void) ...@@ -1211,7 +1211,11 @@ static void free_unnecessary_pages(void)
to_free_highmem = alloc_highmem - save; to_free_highmem = alloc_highmem - save;
} else { } else {
to_free_highmem = 0; to_free_highmem = 0;
to_free_normal -= save - alloc_highmem; save -= alloc_highmem;
if (to_free_normal > save)
to_free_normal -= save;
else
to_free_normal = 0;
} }
memory_bm_position_reset(&copy_bm); memory_bm_position_reset(&copy_bm);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment