mirror of
https://github.com/torvalds/linux.git
synced 2026-09-23 13:14:02 +02:00
x86/mm: drop order parameter from free_pagetable()
Patch series "mm: remove CONFIG_HAVE_BOOTMEM_INFO_NODE (Part 2)", v2. Let's remove the remaining pieces of CONFIG_HAVE_BOOTMEM_INFO_NODE, performing some smaller cleanups around freeing of reserved vmemmap pages on the way. This patch (of 10): All callers pass 0, so let's drop the parameter. Link: https://lore.kernel.org/20260716-bootmem_info_part2-v2-0-4afc76c73d61@kernel.org Link: https://lore.kernel.org/20260716-bootmem_info_part2-v2-1-4afc76c73d61@kernel.org Signed-off-by: David Hildenbrand (Arm) <david@kernel.org> Reviewed-by: Mike Rapoport (Microsoft) <rppt@kernel.org> Reviewed-by: Muchun Song <muchun.song@linux.dev> Reviewed-by: Zi Yan <ziy@nvidia.com> Reviewed-by: Dave Hansen <dave.hansen@linux.intel.com> Cc: Alexander Gordeev <agordeev@linux.ibm.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: "Borislav Petkov (AMD)" <bp@alien8.de> Cc: Brendan Jackman <jackmanb@google.com> Cc: Brendan Jackman <brendan.jackman@linux.dev> Cc: Christian Borntraeger <borntraeger@linux.ibm.com> Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com> Cc: Heiko Carstens <hca@linux.ibm.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Liam R. Howlett <liam@infradead.org> Cc: Lorenzo Stoakes <ljs@kernel.org> Cc: Michal Hocko <mhocko@suse.com> Cc: Oscar Salvador <osalvador@suse.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Suren Baghdasaryan <surenb@google.com> Cc: Sven Schnelle <svens@linux.ibm.com> Cc: Vasily Gorbik <gor@linux.ibm.com> Cc: Vlastimil Babka <vbabka@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
324853ce8d
commit
5e83b4944d
|
|
@ -1006,22 +1006,19 @@ static void free_reserved_pages(struct page *page, unsigned long nr_pages)
|
|||
free_reserved_page(page++);
|
||||
}
|
||||
|
||||
static void __meminit free_pagetable(struct page *page, int order)
|
||||
static void __meminit free_pagetable(struct page *page)
|
||||
{
|
||||
/* bootmem page has reserved flag */
|
||||
if (PageReserved(page)) {
|
||||
unsigned long nr_pages = 1 << order;
|
||||
#ifdef CONFIG_HAVE_BOOTMEM_INFO_NODE
|
||||
enum bootmem_type type = bootmem_type(page);
|
||||
|
||||
if (type == MIX_SECTION_INFO) {
|
||||
while (nr_pages--)
|
||||
put_page_bootmem(page++);
|
||||
} else {
|
||||
free_reserved_pages(page, nr_pages);
|
||||
}
|
||||
if (type == MIX_SECTION_INFO)
|
||||
put_page_bootmem(page);
|
||||
else
|
||||
free_reserved_page(page);
|
||||
#else
|
||||
free_reserved_pages(page, nr_pages);
|
||||
free_reserved_page(page);
|
||||
#endif
|
||||
} else {
|
||||
pagetable_free(page_ptdesc(page));
|
||||
|
|
@ -1060,7 +1057,7 @@ static void __meminit free_pte_table(pte_t *pte_start, pmd_t *pmd)
|
|||
}
|
||||
|
||||
/* free a pte table */
|
||||
free_pagetable(pmd_page(*pmd), 0);
|
||||
free_pagetable(pmd_page(*pmd));
|
||||
spin_lock(&init_mm.page_table_lock);
|
||||
pmd_clear(pmd);
|
||||
spin_unlock(&init_mm.page_table_lock);
|
||||
|
|
@ -1078,7 +1075,7 @@ static void __meminit free_pmd_table(pmd_t *pmd_start, pud_t *pud)
|
|||
}
|
||||
|
||||
/* free a pmd table */
|
||||
free_pagetable(pud_page(*pud), 0);
|
||||
free_pagetable(pud_page(*pud));
|
||||
spin_lock(&init_mm.page_table_lock);
|
||||
pud_clear(pud);
|
||||
spin_unlock(&init_mm.page_table_lock);
|
||||
|
|
@ -1096,7 +1093,7 @@ static void __meminit free_pud_table(pud_t *pud_start, p4d_t *p4d)
|
|||
}
|
||||
|
||||
/* free a pud table */
|
||||
free_pagetable(p4d_page(*p4d), 0);
|
||||
free_pagetable(p4d_page(*p4d));
|
||||
spin_lock(&init_mm.page_table_lock);
|
||||
p4d_clear(p4d);
|
||||
spin_unlock(&init_mm.page_table_lock);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user