diff options
Diffstat (limited to 'target/linux/goldfish/patches-2.6.30/0053-lowmemorykiller-Don-t-count-free-space-unless-it-me.patch')
| -rw-r--r-- | target/linux/goldfish/patches-2.6.30/0053-lowmemorykiller-Don-t-count-free-space-unless-it-me.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/target/linux/goldfish/patches-2.6.30/0053-lowmemorykiller-Don-t-count-free-space-unless-it-me.patch b/target/linux/goldfish/patches-2.6.30/0053-lowmemorykiller-Don-t-count-free-space-unless-it-me.patch new file mode 100644 index 0000000000..0a8e83a828 --- /dev/null +++ b/target/linux/goldfish/patches-2.6.30/0053-lowmemorykiller-Don-t-count-free-space-unless-it-me.patch @@ -0,0 +1,53 @@ +From f82da10dcae73652a6f0355e4398b4be1af17e6b Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com> +Date: Mon, 26 Jan 2009 19:22:19 -0800 +Subject: [PATCH 053/134] lowmemorykiller: Don't count free space unless it meets the specified limit by itself +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +This allows processes to be killed when the kernel evict cache pages in +an attempt to get more contiguous free memory. + +Signed-off-by: Arve Hjønnevåg <arve@android.com> +--- + drivers/staging/android/lowmemorykiller.c | 13 +++++++++---- + 1 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c +index b9a2e84..b2ab7fa 100644 +--- a/drivers/staging/android/lowmemorykiller.c ++++ b/drivers/staging/android/lowmemorykiller.c +@@ -58,20 +58,25 @@ static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask) + int min_adj = OOM_ADJUST_MAX + 1; + int selected_tasksize = 0; + int array_size = ARRAY_SIZE(lowmem_adj); +- int other_free = global_page_state(NR_FREE_PAGES) + global_page_state(NR_FILE_PAGES); ++ int other_free = global_page_state(NR_FREE_PAGES); ++ int other_file = global_page_state(NR_FILE_PAGES); + if(lowmem_adj_size < array_size) + array_size = lowmem_adj_size; + if(lowmem_minfree_size < array_size) + array_size = lowmem_minfree_size; + for(i = 0; i < array_size; i++) { +- if(other_free < lowmem_minfree[i]) { ++ if (other_free < lowmem_minfree[i] && ++ other_file < lowmem_minfree[i]) { + min_adj = lowmem_adj[i]; + break; + } + } + if(nr_to_scan > 0) +- lowmem_print(3, "lowmem_shrink %d, %x, ofree %d, ma %d\n", nr_to_scan, gfp_mask, other_free, min_adj); +- rem = global_page_state(NR_ACTIVE) + global_page_state(NR_INACTIVE); ++ lowmem_print(3, "lowmem_shrink %d, %x, ofree %d %d, ma %d\n", nr_to_scan, gfp_mask, other_free, other_file, min_adj); ++ rem = global_page_state(NR_ACTIVE_ANON) + ++ global_page_state(NR_ACTIVE_FILE) + ++ global_page_state(NR_INACTIVE_ANON) + ++ global_page_state(NR_INACTIVE_FILE); + if (nr_to_scan <= 0 || min_adj == OOM_ADJUST_MAX + 1) { + lowmem_print(5, "lowmem_shrink %d, %x, return %d\n", nr_to_scan, gfp_mask, rem); + return rem; +-- +1.6.2 + |