]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
mm: remove free_unmap_vmap_area_addr()
authorChristoph Hellwig <hch@lst.de>
Tue, 13 Dec 2016 00:44:04 +0000 (16:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Dec 2016 02:55:08 +0000 (18:55 -0800)
Just inline it into the only caller.

Link: http://lkml.kernel.org/r/1479474236-4139-3-git-send-email-hch@lst.de
Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Jisheng Zhang <jszhang@marvell.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Joel Fernandes <joelaf@google.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: John Dias <joaodias@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/vmalloc.c

index c3261143a0af9797bf03268627da8deca36f4456..842ea986adcd535b43d86e4f5efa3df211a945d0 100644 (file)
@@ -731,16 +731,6 @@ static struct vmap_area *find_vmap_area(unsigned long addr)
        return va;
 }
 
-static void free_unmap_vmap_area_addr(unsigned long addr)
-{
-       struct vmap_area *va;
-
-       va = find_vmap_area(addr);
-       BUG_ON(!va);
-       free_unmap_vmap_area(va);
-}
-
-
 /*** Per cpu kva allocator ***/
 
 /*
@@ -1098,6 +1088,7 @@ void vm_unmap_ram(const void *mem, unsigned int count)
 {
        unsigned long size = (unsigned long)count << PAGE_SHIFT;
        unsigned long addr = (unsigned long)mem;
+       struct vmap_area *va;
 
        BUG_ON(!addr);
        BUG_ON(addr < VMALLOC_START);
@@ -1107,10 +1098,14 @@ void vm_unmap_ram(const void *mem, unsigned int count)
        debug_check_no_locks_freed(mem, size);
        vmap_debug_free_range(addr, addr+size);
 
-       if (likely(count <= VMAP_MAX_ALLOC))
+       if (likely(count <= VMAP_MAX_ALLOC)) {
                vb_free(mem, size);
-       else
-               free_unmap_vmap_area_addr(addr);
+               return;
+       }
+
+       va = find_vmap_area(addr);
+       BUG_ON(!va);
+       free_unmap_vmap_area(va);
 }
 EXPORT_SYMBOL(vm_unmap_ram);