Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17c230af authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Linus Torvalds
Browse files

thp: use khugepaged_enabled to remove duplicate code 



Use khugepaged_enabled to see whether thp is enabled

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b7231789

mm/huge_memory.c

+2 −9
Original line number Diff line number Diff line
@@ -102,10 +102,7 @@ static int set_recommended_min_free_kbytes(void) 
	unsigned long recommended_min;

	extern int min_free_kbytes;



	if (!test_bit(TRANSPARENT_HUGEPAGE_FLAG,

		      &transparent_hugepage_flags) &&

	    !test_bit(TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG,

		      &transparent_hugepage_flags))

	if (!khugepaged_enabled())

		return 0;



	for_each_populated_zone(zone)
@@ -228,11 +225,7 @@ static ssize_t enabled_store(struct kobject *kobj, 
			ret = err;

	}



	if (ret > 0 &&

	    (test_bit(TRANSPARENT_HUGEPAGE_FLAG,

		      &transparent_hugepage_flags) ||

	     test_bit(TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG,

		      &transparent_hugepage_flags)))

	if (ret > 0 && khugepaged_enabled())

		set_recommended_min_free_kbytes();



	return ret;