Re: linux-next: build failure after merge of the akpm-current tree

[Mike Rapoport]

On Mon, Oct 18, 2021 at 07:29:40PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the akpm-current tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> init/main.c: In function 'xbc_make_cmdline':
> init/main.c:384:3: error: implicit declaration of function 'memblock_free_ptr'; did you mean 'memblock_free_late'? [-Werror=implicit-function-declaration]
>   384 |   memblock_free_ptr(new_cmdline, len + 1);
>       |   ^~~~~~~~~~~~~~~~~
>       |   memblock_free_late
> cc1: all warnings being treated as errors
> 
> Caused by commit
> 
>   d6e96e5e2e23 ("memblock: use memblock_free for freeing virtual pointers")
> 
> interacting with commit
> 
>   1ae43851b18a ("bootconfig: init: Fix memblock leak in xbc_make_cmdline()")
> 
> from Linus' tree.
> 
> I have applied the following merge fix patch.
> 
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Mon, 18 Oct 2021 19:25:44 +1100
> Subject: [PATCH] fixup for "memblock: use memblock_free for freeing virtual
>  pointers"
> 
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>

Thanks!

Andrew, can you please add this as a fixup to "memblock: use memblock_free
for freeing virtual pointers"?

> ---
>  init/main.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/init/main.c b/init/main.c
> index 9b7fdd04e8cb..2851ebbe1985 100644
> --- a/init/main.c
> +++ b/init/main.c
> @@ -381,7 +381,7 @@ static char * __init xbc_make_cmdline(const char *key)
>  	ret = xbc_snprint_cmdline(new_cmdline, len + 1, root);
>  	if (ret < 0 || ret > len) {
>  		pr_err("Failed to print extra kernel cmdline.\n");
> -		memblock_free_ptr(new_cmdline, len + 1);
> +		memblock_free(new_cmdline, len + 1);
>  		return NULL;
>  	}
>  
> -- 
> 2.33.0
> 
> -- 
> Cheers,
> Stephen Rothwell



-- 
Sincerely yours,
Mike.