arm64: tegra: Remove duplicate nodes on Jetson Orin NX

[thirdparty/linux.git] / mm / vmalloc.c

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 228a4a5312f2213f8bb2cfdef6d07cb94f2abdd3..ef8599d394fd0657b644bdeafaca9b8a781c6d6c 100644 (file)
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -4278,14 +4278,32 @@ void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms)
 #ifdef CONFIG_PRINTK
 bool vmalloc_dump_obj(void *object)
 {
-       struct vm_struct *vm;
        void *objp = (void *)PAGE_ALIGN((unsigned long)object);
+       const void *caller;
+       struct vm_struct *vm;
+       struct vmap_area *va;
+       unsigned long addr;
+       unsigned int nr_pages;
 
-       vm = find_vm_area(objp);
-       if (!vm)
+       if (!spin_trylock(&vmap_area_lock))
+               return false;
+       va = __find_vmap_area((unsigned long)objp, &vmap_area_root);
+       if (!va) {
+               spin_unlock(&vmap_area_lock);
                return false;
+       }
+
+       vm = va->vm;
+       if (!vm) {
+               spin_unlock(&vmap_area_lock);
+               return false;
+       }
+       addr = (unsigned long)vm->addr;
+       caller = vm->caller;
+       nr_pages = vm->nr_pages;
+       spin_unlock(&vmap_area_lock);
        pr_cont(" %u-page vmalloc region starting at %#lx allocated at %pS\n",
-               vm->nr_pages, (unsigned long)vm->addr, vm->caller);
+               nr_pages, addr, caller);
        return true;
 }
 #endif