diff options
Diffstat (limited to 'kernel/power/snapshot.c')
| -rw-r--r-- | kernel/power/snapshot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 36cb168e4330..830cadecbdfc 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c | |||
| @@ -1181,7 +1181,7 @@ static void free_unnecessary_pages(void) | |||
| 1181 | 1181 | ||
| 1182 | memory_bm_position_reset(©_bm); | 1182 | memory_bm_position_reset(©_bm); |
| 1183 | 1183 | ||
| 1184 | while (to_free_normal > 0 && to_free_highmem > 0) { | 1184 | while (to_free_normal > 0 || to_free_highmem > 0) { |
| 1185 | unsigned long pfn = memory_bm_next_pfn(©_bm); | 1185 | unsigned long pfn = memory_bm_next_pfn(©_bm); |
| 1186 | struct page *page = pfn_to_page(pfn); | 1186 | struct page *page = pfn_to_page(pfn); |
| 1187 | 1187 | ||
| @@ -1500,7 +1500,7 @@ asmlinkage int swsusp_save(void) | |||
| 1500 | { | 1500 | { |
| 1501 | unsigned int nr_pages, nr_highmem; | 1501 | unsigned int nr_pages, nr_highmem; |
| 1502 | 1502 | ||
| 1503 | printk(KERN_INFO "PM: Creating hibernation image: \n"); | 1503 | printk(KERN_INFO "PM: Creating hibernation image:\n"); |
| 1504 | 1504 | ||
| 1505 | drain_local_pages(NULL); | 1505 | drain_local_pages(NULL); |
| 1506 | nr_pages = count_data_pages(); | 1506 | nr_pages = count_data_pages(); |
