mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 02:20:54 +07:00
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.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>
This commit is contained in:
parent
c8eef01e2f
commit
9c3acf6043
21
mm/vmalloc.c
21
mm/vmalloc.c
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user