mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-09-18 22:19:30 +02:00
mm/hugetlb_vmemmap: remove bootmem_info leftovers
We never set CONFIG_HAVE_BOOTMEM_INFO_NODE, so we can just switch to free_reserved_page() and drop the register_page_bootmem_memmap() call. Link: https://lore.kernel.org/20260716-bootmem_info_part2-v2-8-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: 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> Cc: Zi Yan <ziy@nvidia.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
committed by
Andrew Morton
parent
ea963eab11
commit
788a0efb95
@@ -12,7 +12,6 @@
|
||||
|
||||
#include <linux/pgtable.h>
|
||||
#include <linux/moduleparam.h>
|
||||
#include <linux/bootmem_info.h>
|
||||
#include <linux/mmdebug.h>
|
||||
#include <linux/pagewalk.h>
|
||||
#include <linux/pgalloc.h>
|
||||
@@ -177,13 +176,13 @@ static int vmemmap_remap_range(unsigned long start, unsigned long end,
|
||||
* Free a vmemmap page. A vmemmap page can be allocated from the memblock
|
||||
* allocator or buddy allocator. If the PG_reserved flag is set, it means
|
||||
* that it allocated from the memblock allocator, just free it via the
|
||||
* free_bootmem_page(). Otherwise, use __free_page().
|
||||
* free_reserved_page(). Otherwise, use __free_page().
|
||||
*/
|
||||
static inline void free_vmemmap_page(struct page *page)
|
||||
{
|
||||
if (PageReserved(page)) {
|
||||
memmap_boot_pages_add(-1);
|
||||
free_bootmem_page(page);
|
||||
free_reserved_page(page);
|
||||
} else {
|
||||
memmap_pages_add(-1);
|
||||
__free_page(page);
|
||||
@@ -641,9 +640,6 @@ static void __hugetlb_vmemmap_optimize_folios(struct hstate *h,
|
||||
epfn = spfn + hugetlb_vmemmap_size(h);
|
||||
vmemmap_wrprotect_hvo(spfn, epfn, folio_nid(folio),
|
||||
HUGETLB_VMEMMAP_RESERVE_SIZE);
|
||||
register_page_bootmem_memmap(pfn_to_section_nr(folio_pfn(folio)),
|
||||
&folio->page,
|
||||
HUGETLB_VMEMMAP_RESERVE_PAGES);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user