Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib/genalloc.c: rename addr_in_gen_pool to gen_pool_has_addr

Browse Source 
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: Huang Shijie <sjhuang@iluvatar.ai>
Reviewed-by: Andrew 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Huang Shijie 2019-12-04 16:52:03 -08:00 committed by Linus Torvalds
parent fd7eb2513f
commit 964975ac66
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/core-api/genalloc.rst
View File

@ -129,7 +129,7 @@ writing of special-purpose memory allocators in the future.
:functions: gen_pool_for_each_chunk :functions: gen_pool_for_each_chunk
.. kernel-doc:: lib/genalloc.c .. kernel-doc:: lib/genalloc.c
:functions: addr_in_gen_pool :functions: gen_pool_has_addr
.. kernel-doc:: lib/genalloc.c .. kernel-doc:: lib/genalloc.c
:functions: gen_pool_avail :functions: gen_pool_avail

2
arch/arm/mm/dma-mapping.c
View File

@ -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) 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) static int __free_from_pool(void *start, size_t size)

2
drivers/misc/sram-exec.c
View File

@ -96,7 +96,7 @@ void *sram_exec_copy(struct gen_pool *pool, void *dst, void *src,
if (!part) if (!part)
return NULL; return NULL;
if (!addr_in_gen_pool(pool, (unsigned long)dst, size)) if (!gen_pool_has_addr(pool, (unsigned long)dst, size))
return NULL; return NULL;
base = (unsigned long)part->base; base = (unsigned long)part->base;

2
include/linux/genalloc.h
View File

@ -206,7 +206,7 @@ extern struct gen_pool *devm_gen_pool_create(struct device *dev,
int min_alloc_order, int nid, const char *name); int min_alloc_order, int nid, const char *name);
extern struct gen_pool *gen_pool_get(struct device *dev, 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); size_t size);
#ifdef CONFIG_OF #ifdef CONFIG_OF

2
kernel/dma/remap.c
View File

@ -178,7 +178,7 @@ bool dma_in_atomic_pool(void *start, size_t size)
if (unlikely(!atomic_pool)) if (unlikely(!atomic_pool))
return false; 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) void *dma_alloc_from_pool(size_t size, struct page **ret_page, gfp_t flags)

6
lib/genalloc.c
View File

@ -540,7 +540,7 @@ void gen_pool_for_each_chunk(struct gen_pool *pool,
EXPORT_SYMBOL(gen_pool_for_each_chunk); EXPORT_SYMBOL(gen_pool_for_each_chunk);
/** /**
* addr_in_gen_pool - checks if an address falls within the range of a pool * gen_pool_has_addr - checks if an address falls within the range of a pool
* @pool: the generic memory pool * @pool: the generic memory pool
* @start: start address * @start: start address
* @size: size of the region * @size: size of the region
@ -548,7 +548,7 @@ EXPORT_SYMBOL(gen_pool_for_each_chunk);
* Check if the range of addresses falls within the specified pool. Returns * Check if the range of addresses falls within the specified pool. Returns
* true if the entire range is contained in the pool and false otherwise. * true if the entire range is contained in the pool and false otherwise.
*/ */
bool addr_in_gen_pool(struct gen_pool *pool, unsigned long start, bool gen_pool_has_addr(struct gen_pool *pool, unsigned long start,
size_t size) size_t size)
{ {
bool found = false; bool found = false;
@ -567,7 +567,7 @@ bool addr_in_gen_pool(struct gen_pool *pool, unsigned long start,
rcu_read_unlock(); rcu_read_unlock();
return found; return found;
} }
EXPORT_SYMBOL(addr_in_gen_pool); EXPORT_SYMBOL(gen_pool_has_addr);
/** /**
* gen_pool_avail - get available free space of the pool * gen_pool_avail - get available free space of the pool