diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-07 13:22:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-07 13:22:41 -0700 |
| commit | 31cb852809c86541c817538c98003678546dfa58 (patch) | |
| tree | 324808c5a9def43a7f15c0fda97f58ee01f03c42 /kernel | |
| parent | 2a9d6df425d7b46b23cbc8673b2dfefa4678abdb (diff) | |
| parent | 4d4cf23cdde2f8f9324f5684a7f349e182039529 (diff) | |
| download | op-kernel-dev-31cb852809c86541c817538c98003678546dfa58.zip op-kernel-dev-31cb852809c86541c817538c98003678546dfa58.tar.gz | |
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()
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/snapshot.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index ace5588..06efa54 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -1211,7 +1211,11 @@ static void free_unnecessary_pages(void) to_free_highmem = alloc_highmem - save; } else { 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(©_bm); |
