transparent_hugepage=never should mean to disable THP completely,
otherwise we don't have a way to disable THP completely.
The design is broken.
Signed-off-by: WANG Cong <amwang@xxxxxxxxxx>
---
mm/huge_memory.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 81532f2..9c63c90 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -488,19 +488,26 @@ static struct attribute_group khugepaged_attr_group = {
};
#endif /* CONFIG_SYSFS */
+#define hugepage_enabled() khugepaged_enabled()
+
static int __init hugepage_init(void)
{
- int err;
+ int err = 0;
#ifdef CONFIG_SYSFS
static struct kobject *hugepage_kobj;
#endif
- err = -EINVAL;
if (!has_transparent_hugepage()) {
+ err = -EINVAL;
transparent_hugepage_flags = 0;
goto out;
}
+ if (!hugepage_enabled()) {
+ printk(KERN_INFO "hugepage: totally disabled\n");
+ goto out;
+ }
+
#ifdef CONFIG_SYSFS
err = -ENOMEM;
hugepage_kobj = kobject_create_and_add("transparent_hugepage", mm_kobj);
--
1.7.4.4
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>