TN8 to Flounder lmk diff

diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index d71353b..a56e089 100644
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -40,9 +40,6 @@
 #include <linux/swap.h>
 #include <linux/rcupdate.h>
 #include <linux/notifier.h>
-#ifdef CONFIG_TEGRA_NVMAP
-#include <linux/nvmap.h>
-#endif

 static uint32_t lowmem_debug_level = 1;
 static short lowmem_adj[6] = {
@@ -80,20 +77,9 @@ 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);
-   int other_free = global_page_state(NR_FREE_PAGES) -
-            global_page_state(NR_FREE_CMA_PAGES) -
-            totalreserve_pages
-#ifdef CONFIG_TEGRA_NVMAP
-            + nvmap_page_pool_get_unused_pages()
-#endif
-            ;
-   int other_file = global_page_state(NR_FILE_PAGES)
-           - global_page_state(NR_SHMEM)
-           - global_page_state(NR_FILE_MAPPED)
-           - total_swapcache_pages();
-
-   if (other_file < 0)
-       other_file = 0;
+   int other_free = global_page_state(NR_FREE_PAGES) - totalreserve_pages;
+   int other_file = global_page_state(NR_FILE_PAGES) -
+                       global_page_state(NR_SHMEM);

    if (lowmem_adj_size < array_size)
        array_size = lowmem_adj_size;