Commit 49266277 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

mm: remove __get_vm_area 



Switch the two remaining callers to use __get_vm_area_caller instead.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: David Airlie <airlied@linux.ie>
Cc: Gao Xiang <xiang@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Cc: Laura Abbott <labbott@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Michael Kelley <mikelley@microsoft.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: Stephen Hemminger <sthemmin@microsoft.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Wei Liu <wei.liu@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Paul Mackerras <paulus@ozlabs.org>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Link: http://lkml.kernel.org/r/20200414131348.444715-9-hch@lst.de


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 91f03f29

arch/powerpc/kernel/pci_64.c

+2 −1
Original line number Diff line number Diff line
@@ -132,7 +132,8 @@ void __iomem *ioremap_phb(phys_addr_t paddr, unsigned long size) 
	 * address decoding but I'd rather not deal with those outside of the

	 * reserved 64K legacy region.

	 */

	area = __get_vm_area(size, 0, PHB_IO_BASE, PHB_IO_END);

	area = __get_vm_area_caller(size, 0, PHB_IO_BASE, PHB_IO_END,

				    __builtin_return_address(0));

	if (!area)

		return NULL;

arch/sh/kernel/cpu/sh4/sq.c

+2 −1
Original line number Diff line number Diff line
@@ -103,7 +103,8 @@ static int __sq_remap(struct sq_mapping *map, pgprot_t prot) 
#if defined(CONFIG_MMU)

	struct vm_struct *vma;



	vma = __get_vm_area(map->size, VM_ALLOC, map->sq_addr, SQ_ADDRMAX);

	vma = __get_vm_area_caller(map->size, VM_ALLOC, map->sq_addr,

			SQ_ADDRMAX, __builtin_return_address(0));

	if (!vma)

		return -ENOMEM;

include/linux/vmalloc.h

+0 −2
Original line number Diff line number Diff line
@@ -161,8 +161,6 @@ static inline size_t get_vm_area_size(const struct vm_struct *area) 
extern struct vm_struct *get_vm_area(unsigned long size, unsigned long flags);

extern struct vm_struct *get_vm_area_caller(unsigned long size,

					unsigned long flags, const void *caller);

extern struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags,

					unsigned long start, unsigned long end);

extern struct vm_struct *__get_vm_area_caller(unsigned long size,

					unsigned long flags,

					unsigned long start, unsigned long end,

mm/vmalloc.c

+0 −8
Original line number Diff line number Diff line
@@ -2128,14 +2128,6 @@ static struct vm_struct *__get_vm_area_node(unsigned long size, 
	return area;

}



struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags,

				unsigned long start, unsigned long end)

{

	return __get_vm_area_node(size, 1, flags, start, end, NUMA_NO_NODE,

				  GFP_KERNEL, __builtin_return_address(0));

}

EXPORT_SYMBOL_GPL(__get_vm_area);



struct vm_struct *__get_vm_area_caller(unsigned long size, unsigned long flags,

				       unsigned long start, unsigned long end,

				       const void *caller)

CRA Git | Maintained and supported by SUSTech CRA and CCSE