Merge tag 'fbdev-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[linux-block.git] / mm / debug.c

diff --git a/mm/debug.c b/mm/debug.c
index bc9ac87f0e08d01a9a3bf7748fd3d3f90d6bd013..0fd15ba70d16317d76163ba7340e2d54cfd064d9 100644 (file)
--- a/mm/debug.c
+++ b/mm/debug.c
@@ -48,7 +48,8 @@ const struct trace_print_flags vmaflag_names[] = {
 
 static void __dump_page(struct page *page)
 {
-       struct page *head = compound_head(page);
+       struct folio *folio = page_folio(page);
+       struct page *head = &folio->page;
        struct address_space *mapping;
        bool compound = PageCompound(page);
        /*
@@ -76,6 +77,7 @@ static void __dump_page(struct page *page)
                else
                        mapping = (void *)(tmp & ~PAGE_MAPPING_FLAGS);
                head = page;
+               folio = (struct folio *)page;
                compound = false;
        } else {
                mapping = page_mapping(page);
@@ -92,16 +94,10 @@ static void __dump_page(struct page *page)
                        page, page_ref_count(head), mapcount, mapping,
                        page_to_pgoff(page), page_to_pfn(page));
        if (compound) {
-               if (hpage_pincount_available(page)) {
-                       pr_warn("head:%p order:%u compound_mapcount:%d compound_pincount:%d\n",
-                                       head, compound_order(head),
-                                       head_compound_mapcount(head),
-                                       head_compound_pincount(head));
-               } else {
-                       pr_warn("head:%p order:%u compound_mapcount:%d\n",
-                                       head, compound_order(head),
-                                       head_compound_mapcount(head));
-               }
+               pr_warn("head:%p order:%u compound_mapcount:%d compound_pincount:%d\n",
+                               head, compound_order(head),
+                               folio_entire_mapcount(folio),
+                               head_compound_pincount(head));
        }
 
 #ifdef CONFIG_MEMCG
@@ -143,13 +139,11 @@ EXPORT_SYMBOL(dump_page);
 
 void dump_vma(const struct vm_area_struct *vma)
 {
-       pr_emerg("vma %px start %px end %px\n"
-               "next %px prev %px mm %px\n"
+       pr_emerg("vma %px start %px end %px mm %px\n"
                "prot %lx anon_vma %px vm_ops %px\n"
                "pgoff %lx file %px private_data %px\n"
                "flags: %#lx(%pGv)\n",
-               vma, (void *)vma->vm_start, (void *)vma->vm_end, vma->vm_next,
-               vma->vm_prev, vma->vm_mm,
+               vma, (void *)vma->vm_start, (void *)vma->vm_end, vma->vm_mm,
                (unsigned long)pgprot_val(vma->vm_page_prot),
                vma->anon_vma, vma->vm_ops, vma->vm_pgoff,
                vma->vm_file, vma->vm_private_data,
@@ -159,11 +153,11 @@ EXPORT_SYMBOL(dump_vma);
 
 void dump_mm(const struct mm_struct *mm)
 {
-       pr_emerg("mm %px mmap %px seqnum %llu task_size %lu\n"
+       pr_emerg("mm %px task_size %lu\n"
 #ifdef CONFIG_MMU
                "get_unmapped_area %px\n"
 #endif
-               "mmap_base %lu mmap_legacy_base %lu highest_vm_end %lu\n"
+               "mmap_base %lu mmap_legacy_base %lu\n"
                "pgd %px mm_users %d mm_count %d pgtables_bytes %lu map_count %d\n"
                "hiwater_rss %lx hiwater_vm %lx total_vm %lx locked_vm %lx\n"
                "pinned_vm %llx data_vm %lx exec_vm %lx stack_vm %lx\n"
@@ -187,11 +181,11 @@ void dump_mm(const struct mm_struct *mm)
                "tlb_flush_pending %d\n"
                "def_flags: %#lx(%pGv)\n",
 
-               mm, mm->mmap, (long long) mm->vmacache_seqnum, mm->task_size,
+               mm, mm->task_size,
 #ifdef CONFIG_MMU
                mm->get_unmapped_area,
 #endif
-               mm->mmap_base, mm->mmap_legacy_base, mm->highest_vm_end,
+               mm->mmap_base, mm->mmap_legacy_base,
                mm->pgd, atomic_read(&mm->mm_users),
                atomic_read(&mm->mm_count),
                mm_pgtables_bytes(mm),
@@ -265,5 +259,4 @@ void page_init_poison(struct page *page, size_t size)
        if (page_init_poisoning)
                memset(page, PAGE_POISON_PATTERN, size);
 }
-EXPORT_SYMBOL_GPL(page_init_poison);
 #endif         /* CONFIG_DEBUG_VM */