Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit c75fd0ee6e1750e6e527ed1d4aeee66739d9ad79

Authored by Rafael J. Wysocki
Committed by Linus Torvalds
1 parent 418106d624
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[PATCH] swsusp: fix memory shrinker 

Fix a bug in the swsusp's memory shrinker that causes some systems using
highmem to refuse to suspend to disk if image_size is set above 1/2 of
available RAM.

Special thanks to Jiri Slaby for reporting the problem and assistance in
debugging it.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Jiri Slaby <jirislaby@gmail.com>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

kernel/power/swsusp.c
Diff comments   View file @ c75fd0e
... ... @@ -229,13 +229,13 @@
229 229 size += highmem_size;
230 230 for_each_zone (zone)
231 231 if (populated_zone(zone)) {
  232 + tmp += snapshot_additional_pages(zone);
232 233 if (is_highmem(zone)) {
233 234 highmem_size -=
234 235 zone_page_state(zone, NR_FREE_PAGES);
235 236 } else {
236 237 tmp -= zone_page_state(zone, NR_FREE_PAGES);
237 238 tmp += zone->lowmem_reserve[ZONE_NORMAL];
238   - tmp += snapshot_additional_pages(zone);
239 239 }
240 240 }
241 241