]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
Revert "lowmemorykiller: zram space available should be accounted"
authorKrishna Reddy <vdumpa@nvidia.com>
Wed, 1 Oct 2014 14:47:31 +0000 (07:47 -0700)
committerWinnie Hsu <whsu@nvidia.com>
Thu, 6 Nov 2014 00:03:44 +0000 (16:03 -0800)
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

drivers/staging/android/lowmemorykiller.c

index eeac2918448d01ceb0971676a8c31fd53399aef1..2c72aec6bb4cc80d55df13f6b915192d1491b6e7 100644 (file)
@@ -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)