Commit 9c3acf60 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds

mm: remove free_unmap_vmap_area_addr()

Just inline it into the only caller.

Link: http://lkml.kernel.org/r/1479474236-4139-3-git-send-email-hch@lst.deSigned-off-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarJisheng 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c8eef01e
...@@ -731,16 +731,6 @@ static struct vmap_area *find_vmap_area(unsigned long addr) ...@@ -731,16 +731,6 @@ static struct vmap_area *find_vmap_area(unsigned long addr)
return va; 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 ***/ /*** Per cpu kva allocator ***/
/* /*
...@@ -1098,6 +1088,7 @@ void vm_unmap_ram(const void *mem, unsigned int count) ...@@ -1098,6 +1088,7 @@ void vm_unmap_ram(const void *mem, unsigned int count)
{ {
unsigned long size = (unsigned long)count << PAGE_SHIFT; unsigned long size = (unsigned long)count << PAGE_SHIFT;
unsigned long addr = (unsigned long)mem; unsigned long addr = (unsigned long)mem;
struct vmap_area *va;
BUG_ON(!addr); BUG_ON(!addr);
BUG_ON(addr < VMALLOC_START); BUG_ON(addr < VMALLOC_START);
...@@ -1107,10 +1098,14 @@ void vm_unmap_ram(const void *mem, unsigned int count) ...@@ -1107,10 +1098,14 @@ void vm_unmap_ram(const void *mem, unsigned int count)
debug_check_no_locks_freed(mem, size); debug_check_no_locks_freed(mem, size);
vmap_debug_free_range(addr, addr+size); vmap_debug_free_range(addr, addr+size);
if (likely(count <= VMAP_MAX_ALLOC)) if (likely(count <= VMAP_MAX_ALLOC)) {
vb_free(mem, size); vb_free(mem, size);
else return;
free_unmap_vmap_area_addr(addr); }
va = find_vmap_area(addr);
BUG_ON(!va);
free_unmap_vmap_area(va);
} }
EXPORT_SYMBOL(vm_unmap_ram); EXPORT_SYMBOL(vm_unmap_ram);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment