diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index eafe846739f49a490f1ea0f1ce923e64d8c988e6..a10f3a6349ea3bb6f859ed5eb4dd91c02e1bef1c 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -66,7 +66,8 @@ unsigned long transparent_hugepage_flags __read_mostly =
 	(1<<TRANSPARENT_HUGEPAGE_DEFRAG_REQ_MADV_FLAG)|
 	(1<<TRANSPARENT_HUGEPAGE_DEFRAG_KHUGEPAGED_FLAG)|
 	(1<<TRANSPARENT_HUGEPAGE_USE_ZERO_PAGE_FLAG)|
-	(1<<TRANSPARENT_HUGEPAGE_FILE_MTHP_FLAG);
+	(1<<TRANSPARENT_HUGEPAGE_FILE_MTHP_FLAG)|
+	(1<<TRANSPARENT_HUGEPAGE_ANON_MAPPING_PMD_ALIGN_FLAG);
 
 static struct shrinker deferred_split_shrinker;
 
@@ -1115,7 +1116,7 @@ unsigned long thp_get_unmapped_area(struct file *filp, unsigned long addr,
 	unsigned long ret;
 	loff_t off = (loff_t)pgoff << PAGE_SHIFT;
 
-	if (filp || thp_anon_mapping_align()) {
+	if (filp || (thp_anon_mapping_align() && IS_ALIGNED(len, PMD_SIZE))) {
 		ret = __thp_get_unmapped_area(filp, addr, len, off, flags,
 					      PMD_SIZE);
 		if (ret)
@@ -1125,7 +1126,7 @@ unsigned long thp_get_unmapped_area(struct file *filp, unsigned long addr,
 	if (mthp_mapping_align_enabled(filp)) {
 		int order = arch_wants_exec_folio_order();
 
-		if (order >= 0) {
+		if (order >= 0 && IS_ALIGNED(len, PAGE_SIZE << order)) {
 			ret = __thp_get_unmapped_area(filp, addr, len, off,
 					flags, PAGE_SIZE << order);
 			if (ret)