Attachment 576266 Details for Bug 785384 – count only low memory pages

[patch] count only low memory pages

only-low-pages.diff (text/plain), 1.48 KB, created by Per Olofsson on 2012-04-09 17:25:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Per Olofsson

Created: 2012-04-09 17:25:30 UTC

Size: 1.48 KB

patch

obsolete

>diff --git a/kernel/power/swap.c b/kernel/power/swap.c
>index 11a594c..37b1c02 100644
>--- a/kernel/power/swap.c
>+++ b/kernel/power/swap.c
>@@ -102,6 +102,11 @@ struct swsusp_extent {
> 
> static struct rb_root swsusp_extents = RB_ROOT;
> 
>+static inline unsigned long nonhigh_free_pages(void)
>+{
>+        return nr_free_pages() - nr_free_highpages();
>+}
>+
> static int swsusp_extents_insert(unsigned long swap_offset)
> {
> 	struct rb_node **new = &(swsusp_extents.rb_node);
>@@ -317,7 +322,7 @@ static int get_swap_writer(struct swap_map_handle *handle)
> 		goto err_rel;
> 	}
> 	handle->k = 0;
>-	handle->nr_free_pages = nr_free_pages() >> 1;
>+	handle->nr_free_pages = nonhigh_free_pages() >> 1;
> 	handle->written = 0;
> 	handle->first_sector = handle->cur_swap;
> 	return 0;
>@@ -619,7 +624,7 @@ static int save_image_lzo(struct swap_map_handle *handle,
> 	 * Adjust number of free pages after all allocations have been done.
> 	 * We don't want to run out of pages when writing.
> 	 */
>-	handle->nr_free_pages = nr_free_pages() >> 1;
>+	handle->nr_free_pages = nonhigh_free_pages() >> 1;
> 
> 	/*
> 	 * Start the CRC32 thread.
>@@ -1130,7 +1135,7 @@ static int load_image_lzo(struct swap_map_handle *handle,
> 	/*
> 	 * Adjust number of pages for read buffering, in case we are short.
> 	 */
>-	read_pages = (nr_free_pages() - snapshot_get_image_size()) >> 1;
>+	read_pages = (nonhigh_free_pages() - snapshot_get_image_size()) >> 1;
> 	read_pages = clamp_val(read_pages, LZO_CMP_PAGES, LZO_READ_PAGES);
> 
> 	for (i = 0; i < read_pages; i++) {

Actions: View | Diff

Attachments on bug 785384: 569728 | 570742 | 571226 | 572081 | 572093 | 572114 | 573466 | 573467 | 573507 | 574743 | 575923 | 576087 | 576205 | 576257 | 576266 | 576333