Commit 964975ac authored by Huang Shijie's avatar Huang Shijie Committed by Linus Torvalds
Browse files

lib/genalloc.c: rename addr_in_gen_pool to gen_pool_has_addr 

Follow the kernel conventions, rename addr_in_gen_pool to
gen_pool_has_addr.

[sjhuang@iluvatar.ai: fix Documentation/ too]
 Link: http://lkml.kernel.org/r/20181229015914.5573-1-sjhuang@iluvatar.ai
Link: http://lkml.kernel.org/r/20181228083950.20398-1-sjhuang@iluvatar.ai


Signed-off-by: default avatarHuang Shijie <sjhuang@iluvatar.ai>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fd7eb251

Documentation/core-api/genalloc.rst

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ writing of special-purpose memory allocators in the future. 
   :functions: gen_pool_for_each_chunk



.. kernel-doc:: lib/genalloc.c

   :functions: addr_in_gen_pool

   :functions: gen_pool_has_addr



.. kernel-doc:: lib/genalloc.c

   :functions: gen_pool_avail

arch/arm/mm/dma-mapping.c

+1 −1
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ static void *__alloc_from_pool(size_t size, struct page **ret_page) 


static bool __in_atomic_pool(void *start, size_t size)

{

	return addr_in_gen_pool(atomic_pool, (unsigned long)start, size);

	return gen_pool_has_addr(atomic_pool, (unsigned long)start, size);

}



static int __free_from_pool(void *start, size_t size)

drivers/misc/sram-exec.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ void *sram_exec_copy(struct gen_pool *pool, void *dst, void *src, 
	if (!part)

		return NULL;



	if (!addr_in_gen_pool(pool, (unsigned long)dst, size))

	if (!gen_pool_has_addr(pool, (unsigned long)dst, size))

		return NULL;



	base = (unsigned long)part->base;

include/linux/genalloc.h

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ extern struct gen_pool *devm_gen_pool_create(struct device *dev, 
		int min_alloc_order, int nid, const char *name);

extern struct gen_pool *gen_pool_get(struct device *dev, const char *name);



bool addr_in_gen_pool(struct gen_pool *pool, unsigned long start,

extern bool gen_pool_has_addr(struct gen_pool *pool, unsigned long start,

			size_t size);



#ifdef CONFIG_OF

kernel/dma/remap.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ bool dma_in_atomic_pool(void *start, size_t size) 
	if (unlikely(!atomic_pool))

		return false;



	return addr_in_gen_pool(atomic_pool, (unsigned long)start, size);

	return gen_pool_has_addr(atomic_pool, (unsigned long)start, size);

}



void *dma_alloc_from_pool(size_t size, struct page **ret_page, gfp_t flags)

CRA Git | Maintained and supported by SUSTech CRA and CCSE