summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorKrishna Reddy <vdumpa@nvidia.com>2014-10-01 07:47:31 -0700
committerWinnie Hsu <whsu@nvidia.com>2014-11-05 16:03:44 -0800
commit32737b472ec9e1c0ca0fc7e290e6cb8425e50e34 (patch)
treee0691ae983884e5eebce3bd67494fff2c2abdbbf /drivers/staging
parent204516bf4c8441ca1c58e55b0f1ba2583962eee4 (diff)
Revert "lowmemorykiller: zram space available should be accounted"
This reverts commit b0a90d9e2cbca96e755f7e385665f1be97fa9a69. This patch causes slow responsiveness of apps as apps would start waiting for kswap daemon to free memory when memory reaches to critically low. Change-Id: I9b6ed33d93a207c93560443152dfb0231215d31f Signed-off-by: Krishna Reddy <vdumpa@nvidia.com> Reviewed-on: http://git-master/r/552601 (cherry picked from commit 5c4229269e32b817feb906953ad2221f4aaa8ed1) Reviewed-on: http://git-master/r/592899 GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/android/lowmemorykiller.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index eeac2918448d..2c72aec6bb4c 100644
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -80,7 +80,6 @@ static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc)
int selected_tasksize = 0;
short selected_oom_score_adj;
int array_size = ARRAY_SIZE(lowmem_adj);
- struct sysinfo swap_info;
int other_free = global_page_state(NR_FREE_PAGES) - totalreserve_pages
#ifdef CONFIG_TEGRA_NVMAP
+ nvmap_page_pool_get_unused_pages()
@@ -89,9 +88,6 @@ static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc)
int other_file = global_page_state(NR_FILE_PAGES) -
global_page_state(NR_SHMEM);
- si_swapinfo(&swap_info);
- other_free += swap_info.freeswap;
-
if (lowmem_adj_size < array_size)
array_size = lowmem_adj_size;
if (lowmem_minfree_size < array_size)