diff options
Diffstat (limited to 'drivers/staging/android/lowmemorykiller.c')
| -rw-r--r-- | drivers/staging/android/lowmemorykiller.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c index f934393f3959..ae41f79d995d 100644 --- a/drivers/staging/android/lowmemorykiller.c +++ b/drivers/staging/android/lowmemorykiller.c @@ -18,6 +18,8 @@ #include <linux/mm.h> #include <linux/oom.h> #include <linux/sched.h> +#include <linux/nodemask.h> +#include <linux/vmstat.h> static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask); @@ -67,6 +69,15 @@ static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask) int array_size = ARRAY_SIZE(lowmem_adj); int other_free = global_page_state(NR_FREE_PAGES); int other_file = global_page_state(NR_FILE_PAGES); + int node; + + for_each_node_state(node, N_HIGH_MEMORY) { + struct zone *z = + &NODE_DATA(node)->node_zones[ZONE_DMA]; + + other_free -= zone_page_state(z, NR_FREE_PAGES); + other_file -= zone_page_state(z, NR_FILE_PAGES); + } if (lowmem_adj_size < array_size) array_size = lowmem_adj_size; @@ -105,7 +116,7 @@ static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask) task_unlock(p); continue; } - oom_adj = mm->oom_adj; + oom_adj = p->oomkilladj; if (oom_adj < min_adj) { task_unlock(p); continue; |