mm-move-some-stuff-to-mm-page_alloch.patch removed from -mm tree
The quilt patch titled
Subject: mm: move some stuff to mm/page_alloc.h
has been removed from the -mm tree. Its filename was
mm-move-some-stuff-to-mm-page_alloch.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: Brendan Jackman <[email protected]>
Subject: mm: move some stuff to mm/page_alloc.h
Date: Fri, 03 Jul 2026 12:31:47 +0000
Some of this stuff in the public header is only used internally so shrink the scope to avoid silently growing new users.
drain_local_pages() is still used from kernel/power/snapshot.c so that needs to stay behind.
---
include/linux/gfp.h | 26 -------------------------- mm/page_alloc.h | 27 +++++++++++++++++++++++++++ mm/vmstat.c | 1 + 3 files changed, 28 insertions(+), 26 deletions(-)
include/linux/gfp.h renamed from include/linux/gfp.h~mm-move-some-stuff-to-mm-page_alloch +0 -26
@@ -17,28 +17,6 @@ struct mempolicy;#define __default_gfp (a,b,...) b#define default_gfp (...) __default_gfp(,##__VA_ARGS__,GFP_KERNEL) -/* Convert GFP flags to their corresponding migrate type */ -#define GFP_MOVABLE_MASK (__GFP_RECLAIMABLE|__GFP_MOVABLE) -#define GFP_MOVABLE_SHIFT 3 - -static inline int gfp_migratetype (const gfp_t gfp_flags) -{ -VM_WARN_ON ((gfp_flags &GFP_MOVABLE_MASK ) ==GFP_MOVABLE_MASK ); -BUILD_BUG_ON ((1UL <<GFP_MOVABLE_SHIFT ) != ___GFP_MOVABLE); -BUILD_BUG_ON ((___GFP_MOVABLE >>GFP_MOVABLE_SHIFT ) !=MIGRATE_MOVABLE ); -BUILD_BUG_ON ((___GFP_RECLAIMABLE >>GFP_MOVABLE_SHIFT ) !=MIGRATE_RECLAIMABLE ); -BUILD_BUG_ON (((___GFP_MOVABLE | ___GFP_RECLAIMABLE) >> -GFP_MOVABLE_SHIFT ) !=MIGRATE_HIGHATOMIC ); - -if (unlikely (page_group_by_mobility_disabled)) -return MIGRATE_UNMOVABLE ; - -/* Group based on mobility */ -return (__force unsigned long )(gfp_flags &GFP_MOVABLE_MASK ) >>GFP_MOVABLE_SHIFT ; -} -#undef GFP_MOVABLE_MASK -#undef GFP_MOVABLE_SHIFT -static inline bool gfpflags_allow_blocking (const gfp_t gfp_flags) {return !!(gfp_flags & __GFP_DIRECT_RECLAIM);
@@ -395,10 +373,6 @@ extern void free_pages(unsigned long add#define __free_page (page) __free_pages((page), 0)#define free_page (addr) free_pages((addr), 0) -void page_alloc_init_cpuhp (void ); -bool decay_pcp_high (struct zone *zone,struct per_cpu_pages *pcp); -void drain_zone_pages (struct zone *zone,struct per_cpu_pages *pcp); -void drain_all_pages (struct zone *zone);void drain_local_pages (struct zone *zone);void page_alloc_init_late (void );
mm/page_alloc.h renamed from mm/page_alloc.h~mm-move-some-stuff-to-mm-page_alloch +27 -0
@@ -266,6 +266,33 @@ static inline bool free_area_empty(struc return list_empty(&area->free_list[migratetype]); } +/* Convert GFP flags to their corresponding migrate type */ +#define GFP_MOVABLE_MASK (__GFP_RECLAIMABLE|__GFP_MOVABLE) +#define GFP_MOVABLE_SHIFT 3 + +static inline int gfp_migratetype (const gfp_t gfp_flags) +{ +VM_WARN_ON ((gfp_flags &GFP_MOVABLE_MASK ) ==GFP_MOVABLE_MASK ); +BUILD_BUG_ON ((1UL <<GFP_MOVABLE_SHIFT ) != ___GFP_MOVABLE); +BUILD_BUG_ON ((___GFP_MOVABLE >>GFP_MOVABLE_SHIFT ) !=MIGRATE_MOVABLE ); +BUILD_BUG_ON ((___GFP_RECLAIMABLE >>GFP_MOVABLE_SHIFT ) !=MIGRATE_RECLAIMABLE ); +BUILD_BUG_ON (((___GFP_MOVABLE | ___GFP_RECLAIMABLE) >> +GFP_MOVABLE_SHIFT ) !=MIGRATE_HIGHATOMIC ); + +if (unlikely (page_group_by_mobility_disabled)) +return MIGRATE_UNMOVABLE ; + +/* Group based on mobility */ +return (__force unsigned long )(gfp_flags &GFP_MOVABLE_MASK ) >>GFP_MOVABLE_SHIFT ; +} +#undef GFP_MOVABLE_MASK +#undef GFP_MOVABLE_SHIFT + +bool decay_pcp_high (struct zone *zone,struct per_cpu_pages *pcp); +void drain_zone_pages (struct zone *zone,struct per_cpu_pages *pcp); +void drain_all_pages (struct zone *zone); + +void page_alloc_init_cpuhp (void );void page_alloc_sysctl_init (void );#endif /* __MM_PAGE_ALLOC_H */
mm/vmstat.c renamed from mm/vmstat.c~mm-move-some-stuff-to-mm-page_alloch +1 -0
@@ -30,6 +30,7 @@#include <linux/sched/isolation.h> #include "internal.h" +#include "page_alloc.h" #ifdef CONFIG_PROC_FS #ifdef CONFIG_NUMA
_
Patches currently in -mm which might be from [email protected] are
mm-secretmem-dont-allow-highmem-folios.patch mm-page_alloc-dont-spin_trylock-in-nmi-on-up.patch mm-page_alloc-dont-spin_trylock-when-disallowed-in-free_one_page.patch mm-page_alloc-rename-fpi_trylock-fpi_nolock.patch cgroup-cpuset-update-some-comments-about-the-page-allocator.patch mm-page_alloc-fixup-alloc_pages_nolock_noprof-comment.patch mm-page_alloc-remove-a-couple-of-vm_bug_onst.patch