diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/huge_memory.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 77b470b7e3c..a169c4dbcdd 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c | |||
@@ -102,10 +102,7 @@ static int set_recommended_min_free_kbytes(void) | |||
102 | unsigned long recommended_min; | 102 | unsigned long recommended_min; |
103 | extern int min_free_kbytes; | 103 | extern int min_free_kbytes; |
104 | 104 | ||
105 | if (!test_bit(TRANSPARENT_HUGEPAGE_FLAG, | 105 | if (!khugepaged_enabled()) |
106 | &transparent_hugepage_flags) && | ||
107 | !test_bit(TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG, | ||
108 | &transparent_hugepage_flags)) | ||
109 | return 0; | 106 | return 0; |
110 | 107 | ||
111 | for_each_populated_zone(zone) | 108 | for_each_populated_zone(zone) |
@@ -228,11 +225,7 @@ static ssize_t enabled_store(struct kobject *kobj, | |||
228 | ret = err; | 225 | ret = err; |
229 | } | 226 | } |
230 | 227 | ||
231 | if (ret > 0 && | 228 | if (ret > 0 && khugepaged_enabled()) |
232 | (test_bit(TRANSPARENT_HUGEPAGE_FLAG, | ||
233 | &transparent_hugepage_flags) || | ||
234 | test_bit(TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG, | ||
235 | &transparent_hugepage_flags))) | ||
236 | set_recommended_min_free_kbytes(); | 229 | set_recommended_min_free_kbytes(); |
237 | 230 | ||
238 | return ret; | 231 | return ret; |