]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
mm/page_alloc: cleanup flag vars in alloc_pages_bulk_noprof()
authorBrendan Jackman <jackmanb@google.com>
Tue, 31 Mar 2026 10:52:13 +0000 (10:52 +0000)
committerAndrew Morton <akpm@linux-foundation.org>
Fri, 29 May 2026 04:04:51 +0000 (21:04 -0700)
These two variables are redundant, squash them to align
alloc_pages_bulk_noprof() with the style used in
alloc_frozen_pages_nolock_noprof().

Link: https://lore.kernel.org/20260331-b4-prepare_alloc_pages-flags-v1-1-ea2416def698@google.com
Signed-off-by: Brendan Jackman <jackmanb@google.com>
Reviewed-by: Suren Baghdasaryan <surenb@google.com>
Reviewed-by: Vishal Moola <vishal.moola@gmail.com>
Reviewed-by: Vlastimil Babka (SUSE) <vbabka@kernel.org>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/page_alloc.c

index a81ae57810368859a1d36cf48ca3cc0081fbb01c..baf41005f90e691b0a098fc69522f370e883186d 100644 (file)
@@ -5054,7 +5054,6 @@ unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid,
        struct per_cpu_pages *pcp;
        struct list_head *pcp_list;
        struct alloc_context ac;
-       gfp_t alloc_gfp;
        unsigned int alloc_flags = ALLOC_WMARK_LOW;
        int nr_populated = 0, nr_account = 0;
 
@@ -5095,10 +5094,8 @@ unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid,
 
        /* May set ALLOC_NOFRAGMENT, fragmentation will return 1 page. */
        gfp &= gfp_allowed_mask;
-       alloc_gfp = gfp;
-       if (!prepare_alloc_pages(gfp, 0, preferred_nid, nodemask, &ac, &alloc_gfp, &alloc_flags))
+       if (!prepare_alloc_pages(gfp, 0, preferred_nid, nodemask, &ac, &gfp, &alloc_flags))
                goto out;
-       gfp = alloc_gfp;
 
        /* Find an allowed local zone that meets the low watermark. */
        z = ac.preferred_zoneref;