linux-next: build failure after merge of the akpm-current tree
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_latecc1: 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 <[email protected]>
Date: Mon, 18 Oct 2021 19:25:44 +1100
Subject: [PATCH] fixup for "memblock: use memblock_free for freeing virtual
pointers"
--- init/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
init/main.c +1 -1
@@ -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 ; }
Signature · 5 lines
2.33.0 -- Cheers, Stephen Rothwell
Quoted 22 lines · Stephen Rothwell
Hi all,
After merging the akpm-current tree, today's linux-next build (
x86_64allmodconfig) 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_latecc1: all warnings being treated as errors
Caused by commit
d6e96e5e2e23("memblock: usememblock_freefor freeing virtual pointers")interacting with commit
1ae43851b18a("bootconfig: init: Fix memblock leak inxbc_make_cmdline()")from Linus' tree.
Quoted 8 lines
I have applied the following merge fix patch.
From: Stephen Rothwell <[email protected]>
Date: Mon, 18 Oct 2021 19:25:44 +1100
Subject: [PATCH] fixup for "memblock: usememblock_freefor freeing virtual
pointers"Signed-off-by Stephen Rothwell <[email protected]>
Thanks!
Andrew, can you please add this as a fixup to "memblock: use memblock_free for freeing virtual pointers"?
Quoted 23 lines
--- init/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)init/main.c +1
-1@@ -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 ; }Signature · 5 lines
2.33.0 -- Cheers, Stephen Rothwell
Signature · 2 lines
Sincerely yours, Mike.