Hi all,
On Fri, 10 Jan 2025 12:44:06 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> io_uring/memmap.c: In function 'io_region_allocate_pages':
> io_uring/memmap.c:173:24: error: implicit declaration of function 'alloc_pages_bulk_array_node'; did you mean 'alloc_pages_bulk_node'? [-Wimplicit-function-declaration]
> 173 | nr_allocated = alloc_pages_bulk_array_node(gfp, NUMA_NO_NODE,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> | alloc_pages_bulk_node
>
> Caused by commit
>
> 1e21df691ffa ("io_uring/memmap: implement kernel allocated regions")
That commit is now in Linus' tree.
> interacting with commit
>
> 4f6a90a13f78 ("mm: alloc_pages_bulk: rename API")
That is now commit
8c3cbdcf4d82 ("mm: alloc_pages_bulk: rename API")
in the mm-stable tree.
> I have applied the following merge fix up patch.
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Fri, 10 Jan 2025 12:40:38 +1100
> Subject: [PATCH] fix up for "io_uring/memmap: implement kernel allocated
> regions"
>
> interacting with "mm: alloc_pages_bulk: rename API" from the mm tree
>
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
> io_uring/memmap.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/io_uring/memmap.c b/io_uring/memmap.c
> index dda846190fbd..361134544427 100644
> --- a/io_uring/memmap.c
> +++ b/io_uring/memmap.c
> @@ -170,8 +170,8 @@ static int io_region_allocate_pages(struct io_ring_ctx *ctx,
> goto done;
> }
>
> - nr_allocated = alloc_pages_bulk_array_node(gfp, NUMA_NO_NODE,
> - mr->nr_pages, pages);
> + nr_allocated = alloc_pages_bulk_node(gfp, NUMA_NO_NODE,
> + mr->nr_pages, pages);
> if (nr_allocated != mr->nr_pages) {
> if (nr_allocated)
> release_pages(pages, nr_allocated);
> --
> 2.45.2
--
Cheers,
Stephen Rothwell
Attachment:
pgpt0zcfr9184.pgp
Description: OpenPGP digital signature
