Message ID | 1386334761-25517-128-git-send-email-luis.henriques@canonical.com |
---|---|
State | New |
Headers | show |
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 349587b..e8d1a82 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -1399,7 +1399,11 @@ int hibernate_preallocate_memory(void) * highmem and non-highmem zones separately. */ pages_highmem = preallocate_image_highmem(highmem / 2); - alloc = (count - max_size) - pages_highmem; + alloc = count - max_size; + if (alloc > pages_highmem) + alloc -= pages_highmem; + else + alloc = 0; pages = preallocate_image_memory(alloc, avail_normal); if (pages < alloc) { /* We have exhausted non-highmem pages, try highmem. */