summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJianguo Wu <wujianguo@huawei.com>2013-11-12 15:07:16 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-13 12:09:03 +0900
commit8bfa3f9a012c4049f3d661f7a772cd9c27a7da99 (patch)
tree2480ec824edeaf1240c5a2558ec5afe2976a40a8
parentc69ded84a968e8ecc529b4de68522e4a2dcbf92a (diff)
downloadlinux-stable-8bfa3f9a012c4049f3d661f7a772cd9c27a7da99.tar.gz
linux-stable-8bfa3f9a012c4049f3d661f7a772cd9c27a7da99.tar.bz2
linux-stable-8bfa3f9a012c4049f3d661f7a772cd9c27a7da99.zip
mm/huge_memory.c: fix stale comments of transparent_hugepage_flags
Since commit 13ece886d99c ("thp: transparent hugepage config choice"), transparent hugepage support is disabled by default, and TRANSPARENT_HUGEPAGE_ALWAYS is configured when TRANSPARENT_HUGEPAGE=y. And since commit d39d33c332c6 ("thp: enable direct defrag"), defrag is enable for all transparent hugepage page faults by default, not only in MADV_HUGEPAGE regions. Signed-off-by: Jianguo Wu <wujianguo@huawei.com> Reviewed-by: Wanpeng Li <liwanp@linux.vnet.ibm.com> Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/huge_memory.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 2612f60f53ee..4f7e2113646c 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -27,11 +27,12 @@
#include "internal.h"
/*
- * By default transparent hugepage support is enabled for all mappings
- * and khugepaged scans all mappings. Defrag is only invoked by
- * khugepaged hugepage allocations and by page faults inside
- * MADV_HUGEPAGE regions to avoid the risk of slowing down short lived
- * allocations.
+ * By default transparent hugepage support is disabled in order that avoid
+ * to risk increase the memory footprint of applications without a guaranteed
+ * benefit. When transparent hugepage support is enabled, is for all mappings,
+ * and khugepaged scans all mappings.
+ * Defrag is invoked by khugepaged hugepage allocations and by page faults
+ * for all hugepage allocations.
*/
unsigned long transparent_hugepage_flags __read_mostly =
#ifdef CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS