Skip to contentSkip to conversation

mm-balloon_compaction-fold-balloon_mapping_gfp_mask-into-balloon_page_alloc.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jan 31

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/balloon_compaction: fold balloon_mapping_gfp_mask() into balloon_page_alloc()
has been removed from the -mm tree. Its filename was
mm-balloon_compaction-fold-balloon_mapping_gfp_mask-into-balloon_page_alloc.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: "David Hildenbrand (Red Hat)" <[email protected]>
Subject: mm/balloon_compaction: fold balloon_mapping_gfp_mask() into balloon_page_alloc()
Date: Tue, 20 Jan 2026 00:01:22 +0100

Let's just remove balloon_mapping_gfp_mask().

Cc Arnd Bergmann <[email protected]>
Cc Christophe Leroy <[email protected]>
Cc Eugenio Pérez <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Jason Wang <[email protected]>
Cc Jerrin Shaji George <[email protected]>
Cc Jonathan Corbet <[email protected]>
Cc Liam Howlett <[email protected]>
Cc Madhavan Srinivasan <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Mike Rapoport <[email protected]>
Cc Nicholas Piggin <[email protected]>
Cc Oscar Salvador <[email protected]>
Cc SeongJae Park <[email protected]>
Cc Suren Baghdasaryan <[email protected]>
Cc Vlastimil Babka <[email protected]>
Cc Xuan Zhuo <[email protected]>
Cc Zi Yan <[email protected]>

---

 include/linux/balloon_compaction.h |    7 -------
 mm/balloon_compaction.c            |   12 ++++++++----
 2 files changed, 8 insertions(+), 11 deletions(-)
include/linux/balloon_compaction.h renamed from include/linux/balloon_compaction.h~mm-balloon_compaction-fold-balloon_mapping_gfp_mask-into-balloon_page_alloc +0 -7
@@ -106,13 +106,6 @@ static inline void balloon_page_insert(s
 	list_add(&page->lru, &balloon->pages);
 }
 
-static inline gfp_t balloon_mapping_gfp_mask(void)
-{
-	if (IS_ENABLED(CONFIG_BALLOON_COMPACTION))
-		return GFP_HIGHUSER_MOVABLE;
-	return GFP_HIGHUSER;
-}
-
 /*
  * balloon_page_finalize - prepare a balloon page that was removed from the
  *			   balloon list for release to the page allocator
mm/balloon_compaction.c renamed from mm/balloon_compaction.c~mm-balloon_compaction-fold-balloon_mapping_gfp_mask-into-balloon_page_alloc +8 -4
@@ -112,10 +112,14 @@ EXPORT_SYMBOL_GPL(balloon_page_list_dequ
  */
 struct page *balloon_page_alloc(void)
 {
-	struct page *page = alloc_page(balloon_mapping_gfp_mask() |
-				       __GFP_NOMEMALLOC | __GFP_NORETRY |
-				       __GFP_NOWARN);
-	return page;
+	gfp_t gfp_flags = __GFP_NOMEMALLOC | __GFP_NORETRY | __GFP_NOWARN;
+
+	if (IS_ENABLED(CONFIG_BALLOON_COMPACTION))
+		gfp_flags |= GFP_HIGHUSER_MOVABLE;
+	else
+		gfp_flags |= GFP_HIGHUSER;
+
+	return alloc_page(gfp_flags);
 }
 EXPORT_SYMBOL_GPL(balloon_page_alloc);
 

_

Patches currently in -mm which might be from [email protected] are

mm-move-pte-table-reclaim-code-to-memoryc.patch mm-memory-handle-non-split-locks-correctly-in-zap_empty_pte_table.patch