From e5f9ab37c8a692ef86f9f8df19db27a569d30237 Mon Sep 17 00:00:00 2001
From: Bang Peng <bang.peng@amlogic.com>
Date: Thu, 3 May 2018 16:25:41 +0800
Subject: [PATCH] mm: fixed tvp alloc failed

PD#159668: fixed tvp alloc failed

[<ffffff80091c38a0>] shrink_inactive_list+0x578/0x584
[<ffffff80091c42c4>] shrink_node_memcg.isra.71+0x6a4/0x734
[<ffffff80091c43c8>] shrink_node+0x74/0x1e0
[<ffffff80091c46f0>] try_to_free_pages+0x1bc/0x4c0
[<ffffff80091b3f10>] __alloc_pages_nodemask+0x5a8/0xd0c
[<ffffff8009983898>] get_migrate_page+0x2c/0x34
[<ffffff8009203c84>] migrate_pages+0xe0/0x890
[<ffffff8009983548>] aml_alloc_contig_migrate_range+0x98/0x150
[<ffffff8009983788>] cma_boost_work_func+0x188/0x26c
[<ffffff80090c53e8>] kthread+0x10c/0x120
[<ffffff80090836e0>] ret_from_fork+0x10/0x30

Change-Id: Iada340b48dcb2ba2ebf7570a15cec21553fd0d0a
Signed-off-by: Bang Peng <bang.peng@amlogic.com>
---
 mm/vmscan.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mm/vmscan.c b/mm/vmscan.c
index f981790b8a38..64b9303bfd7f 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1634,9 +1634,10 @@ static int too_many_isolated(struct pglist_data *pgdat, int file,
 	 * won't get blocked by normal direct-reclaimers, forming a circular
 	 * deadlock.
 	 */
+#ifndef CONFIG_AMLOGIC_MODIFY
 	if ((sc->gfp_mask & (__GFP_IO | __GFP_FS)) == (__GFP_IO | __GFP_FS))
 		inactive >>= 3;
-
+#endif
 #ifdef CONFIG_AMLOGIC_CMA
 	WARN_ONCE(isolated > inactive,
 		  "isolated:%ld, cma:%ld, inactive:%ld, mask:%x, file:%d\n",