diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/power/swsusp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c index acf79ac1cb6d..2d5c45676442 100644 --- a/kernel/power/swsusp.c +++ b/kernel/power/swsusp.c | |||
@@ -1095,7 +1095,7 @@ static inline void eat_page(void *page) | |||
1095 | *eaten_memory = c; | 1095 | *eaten_memory = c; |
1096 | } | 1096 | } |
1097 | 1097 | ||
1098 | static unsigned long get_usable_page(unsigned gfp_mask) | 1098 | unsigned long get_usable_page(unsigned gfp_mask) |
1099 | { | 1099 | { |
1100 | unsigned long m; | 1100 | unsigned long m; |
1101 | 1101 | ||
@@ -1109,7 +1109,7 @@ static unsigned long get_usable_page(unsigned gfp_mask) | |||
1109 | return m; | 1109 | return m; |
1110 | } | 1110 | } |
1111 | 1111 | ||
1112 | static void free_eaten_memory(void) | 1112 | void free_eaten_memory(void) |
1113 | { | 1113 | { |
1114 | unsigned long m; | 1114 | unsigned long m; |
1115 | void **c; | 1115 | void **c; |
@@ -1481,11 +1481,12 @@ static int read_suspend_image(void) | |||
1481 | /* Allocate memory for the image and read the data from swap */ | 1481 | /* Allocate memory for the image and read the data from swap */ |
1482 | 1482 | ||
1483 | error = check_pagedir(pagedir_nosave); | 1483 | error = check_pagedir(pagedir_nosave); |
1484 | free_eaten_memory(); | 1484 | |
1485 | if (!error) | 1485 | if (!error) |
1486 | error = data_read(pagedir_nosave); | 1486 | error = data_read(pagedir_nosave); |
1487 | 1487 | ||
1488 | if (error) { /* We fail cleanly */ | 1488 | if (error) { /* We fail cleanly */ |
1489 | free_eaten_memory(); | ||
1489 | for_each_pbe (p, pagedir_nosave) | 1490 | for_each_pbe (p, pagedir_nosave) |
1490 | if (p->address) { | 1491 | if (p->address) { |
1491 | free_page(p->address); | 1492 | free_page(p->address); |