The patch titled
Subject: lib/genalloc.c: rename addr_in_gen_pool to gen_pool_has_addr
has been added to the -mm tree. Its filename is
lib-genallocc-rename-addr_in_gen_pool-to-gen_pool_has_addr.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/lib-genallocc-rename-addr_in_gen_pool-to-gen_pool_has_addr.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/lib-genallocc-rename-addr_in_gen_pool-to-gen_pool_has_addr.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Huang Shijie <sjhuang@xxxxxxxxxxx>
Subject: 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.
Link: http://lkml.kernel.org/r/20181228083950.20398-1-sjhuang@xxxxxxxxxxx
Signed-off-by: Huang Shijie <sjhuang@xxxxxxxxxxx>
Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Russell King <linux@xxxxxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
Cc: Robin Murphy <robin.murphy@xxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
--- a/arch/arm/mm/dma-mapping.c~lib-genallocc-rename-addr_in_gen_pool-to-gen_pool_has_addr
+++ a/arch/arm/mm/dma-mapping.c
@@ -563,7 +563,7 @@ static void *__alloc_from_pool(size_t si
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)
--- a/drivers/misc/sram-exec.c~lib-genallocc-rename-addr_in_gen_pool-to-gen_pool_has_addr
+++ a/drivers/misc/sram-exec.c
@@ -96,7 +96,7 @@ void *sram_exec_copy(struct gen_pool *po
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;
--- a/include/linux/genalloc.h~lib-genallocc-rename-addr_in_gen_pool-to-gen_pool_has_addr
+++ a/include/linux/genalloc.h
@@ -156,7 +156,7 @@ extern struct gen_pool *devm_gen_pool_cr
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
--- a/kernel/dma/remap.c~lib-genallocc-rename-addr_in_gen_pool-to-gen_pool_has_addr
+++ a/kernel/dma/remap.c
@@ -158,7 +158,7 @@ out:
bool dma_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);
}
void *dma_alloc_from_pool(size_t size, struct page **ret_page, gfp_t flags)
--- a/lib/genalloc.c~lib-genallocc-rename-addr_in_gen_pool-to-gen_pool_has_addr
+++ a/lib/genalloc.c
@@ -423,7 +423,7 @@ void gen_pool_for_each_chunk(struct gen_
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
* @start: start address
* @size: size of the region
@@ -431,7 +431,7 @@ EXPORT_SYMBOL(gen_pool_for_each_chunk);
* 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.
*/
-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)
{
bool found = false;
@@ -450,7 +450,7 @@ bool addr_in_gen_pool(struct gen_pool *p
rcu_read_unlock();
return found;
}
-EXPORT_SYMBOL(addr_in_gen_pool);
+EXPORT_SYMBOL(gen_pool_has_addr);
/**
* gen_pool_avail - get available free space of the pool
_
Patches currently in -mm which might be from sjhuang@xxxxxxxxxxx are
mm-change-the-order-of-migrate_reclaimable-migrate_movable-in-fallbacks.patch
lib-genallocc-use-the-vzalloc_node-to-allocate-the-bitmap.patch
lib-genallocc-export-symbol-addr_in_gen_pool.patch
lib-genallocc-rename-addr_in_gen_pool-to-gen_pool_has_addr.patch
