The patch titled
thp: don't allow transparent hugepage support without PSE
has been removed from the -mm tree. Its filename was
thp-dont-allow-transparent-hugepage-support-without-pse.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: thp: don't allow transparent hugepage support without PSE
From: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Archs implementing Transparent Hugepage Support must implement a function
called has_transparent_hugepage to be sure the virtual or physical CPU
supports Transparent Hugepages.
Signed-off-by: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/include/asm/pgtable.h | 5 +++++
mm/huge_memory.c | 8 ++++++++
2 files changed, 13 insertions(+)
diff -puN arch/x86/include/asm/pgtable.h~thp-dont-allow-transparent-hugepage-support-without-pse arch/x86/include/asm/pgtable.h
--- a/arch/x86/include/asm/pgtable.h~thp-dont-allow-transparent-hugepage-support-without-pse
+++ a/arch/x86/include/asm/pgtable.h
@@ -160,6 +160,11 @@ static inline int pmd_trans_huge(pmd_t p
{
return pmd_val(pmd) & _PAGE_PSE;
}
+
+static inline int has_transparent_hugepage(void)
+{
+ return cpu_has_pse;
+}
#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
static inline pte_t pte_set_flags(pte_t pte, pteval_t set)
diff -puN mm/huge_memory.c~thp-dont-allow-transparent-hugepage-support-without-pse mm/huge_memory.c
--- a/mm/huge_memory.c~thp-dont-allow-transparent-hugepage-support-without-pse
+++ a/mm/huge_memory.c
@@ -487,7 +487,15 @@ static int __init hugepage_init(void)
int err;
#ifdef CONFIG_SYSFS
static struct kobject *hugepage_kobj;
+#endif
+ err = -EINVAL;
+ if (!has_transparent_hugepage()) {
+ transparent_hugepage_flags = 0;
+ goto out;
+ }
+
+#ifdef CONFIG_SYSFS
err = -ENOMEM;
hugepage_kobj = kobject_create_and_add("transparent_hugepage", mm_kobj);
if (unlikely(!hugepage_kobj)) {
_
Patches currently in -mm which might be from aarcange@xxxxxxxxxx are
origin.patch
thp-add-pagetranscompound.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
