diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-08 08:30:29 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-08 08:30:29 -0400 |
| commit | 0a2d31b62dba9b5b92a38c67c9cc42630513662a (patch) | |
| tree | f755d74ec85248de645e10c45ed1a2ed467530f6 /kernel/power/snapshot.c | |
| parent | 8039290a91c5dc4414093c086987a5d7738fe2fd (diff) | |
| parent | df944f66784e6d4f2f50739263a4947885d8b6ae (diff) | |
Merge branch 'fix/kconfig' into for-linus
Diffstat (limited to 'kernel/power/snapshot.c')
| -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 ace55889f702..06efa54f93d6 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c | |||
| @@ -1211,7 +1211,11 @@ static void free_unnecessary_pages(void) | |||
| 1211 | to_free_highmem = alloc_highmem - save; | 1211 | to_free_highmem = alloc_highmem - save; |
| 1212 | } else { | 1212 | } else { |
| 1213 | to_free_highmem = 0; | 1213 | to_free_highmem = 0; |
| 1214 | to_free_normal -= save - alloc_highmem; | 1214 | save -= alloc_highmem; |
| 1215 | if (to_free_normal > save) | ||
| 1216 | to_free_normal -= save; | ||
| 1217 | else | ||
| 1218 | to_free_normal = 0; | ||
| 1215 | } | 1219 | } |
| 1216 | 1220 | ||
| 1217 | memory_bm_position_reset(©_bm); | 1221 | memory_bm_position_reset(©_bm); |
