diff options
-rw-r--r-- | 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 b9a2e843e2f..b2ab7faac4f 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) | |||
58 | int min_adj = OOM_ADJUST_MAX + 1; | 58 | int min_adj = OOM_ADJUST_MAX + 1; |
59 | int selected_tasksize = 0; | 59 | int selected_tasksize = 0; |
60 | int array_size = ARRAY_SIZE(lowmem_adj); | 60 | int array_size = ARRAY_SIZE(lowmem_adj); |
61 | int other_free = global_page_state(NR_FREE_PAGES) + global_page_state(NR_FILE_PAGES); | 61 | int other_free = global_page_state(NR_FREE_PAGES); |
62 | int other_file = global_page_state(NR_FILE_PAGES); | ||
62 | if(lowmem_adj_size < array_size) | 63 | if(lowmem_adj_size < array_size) |
63 | array_size = lowmem_adj_size; | 64 | array_size = lowmem_adj_size; |
64 | if(lowmem_minfree_size < array_size) | 65 | if(lowmem_minfree_size < array_size) |
65 | array_size = lowmem_minfree_size; | 66 | array_size = lowmem_minfree_size; |
66 | for(i = 0; i < array_size; i++) { | 67 | for(i = 0; i < array_size; i++) { |
67 | if(other_free < lowmem_minfree[i]) { | 68 | if (other_free < lowmem_minfree[i] && |
69 | other_file < lowmem_minfree[i]) { | ||
68 | min_adj = lowmem_adj[i]; | 70 | min_adj = lowmem_adj[i]; |
69 | break; | 71 | break; |
70 | } | 72 | } |
71 | } | 73 | } |
72 | if(nr_to_scan > 0) | 74 | if(nr_to_scan > 0) |
73 | lowmem_print(3, "lowmem_shrink %d, %x, ofree %d, ma %d\n", nr_to_scan, gfp_mask, other_free, min_adj); | 75 | lowmem_print(3, "lowmem_shrink %d, %x, ofree %d %d, ma %d\n", nr_to_scan, gfp_mask, other_free, other_file, min_adj); |
74 | rem = global_page_state(NR_ACTIVE) + global_page_state(NR_INACTIVE); | 76 | rem = global_page_state(NR_ACTIVE_ANON) + |
77 | global_page_state(NR_ACTIVE_FILE) + | ||
78 | global_page_state(NR_INACTIVE_ANON) + | ||
79 | global_page_state(NR_INACTIVE_FILE); | ||
75 | if (nr_to_scan <= 0 || min_adj == OOM_ADJUST_MAX + 1) { | 80 | if (nr_to_scan <= 0 || min_adj == OOM_ADJUST_MAX + 1) { |
76 | lowmem_print(5, "lowmem_shrink %d, %x, return %d\n", nr_to_scan, gfp_mask, rem); | 81 | lowmem_print(5, "lowmem_shrink %d, %x, return %d\n", nr_to_scan, gfp_mask, rem); |
77 | return rem; | 82 | return rem; |