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

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
...@@ -102,10 +102,7 @@ static int set_recommended_min_free_kbytes(void) ...@@ -102,10 +102,7 @@ static int set_recommended_min_free_kbytes(void)
unsigned long recommended_min; unsigned long recommended_min;
extern int min_free_kbytes; extern int min_free_kbytes;
if (!test_bit(TRANSPARENT_HUGEPAGE_FLAG, if (!khugepaged_enabled())
&transparent_hugepage_flags) &&
!test_bit(TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG,
&transparent_hugepage_flags))
return 0; return 0;
for_each_populated_zone(zone) for_each_populated_zone(zone)
...@@ -228,11 +225,7 @@ static ssize_t enabled_store(struct kobject *kobj, ...@@ -228,11 +225,7 @@ static ssize_t enabled_store(struct kobject *kobj,
ret = err; ret = err;
} }
if (ret > 0 && if (ret > 0 && khugepaged_enabled())
(test_bit(TRANSPARENT_HUGEPAGE_FLAG,
&transparent_hugepage_flags) ||
test_bit(TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG,
&transparent_hugepage_flags)))
set_recommended_min_free_kbytes(); set_recommended_min_free_kbytes();
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment