From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FEB0C433F5 for ; Mon, 18 Oct 2021 10:26:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3A5C661212 for ; Mon, 18 Oct 2021 10:26:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229901AbhJRK2x (ORCPT ); Mon, 18 Oct 2021 06:28:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:59076 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231609AbhJRK2m (ORCPT ); Mon, 18 Oct 2021 06:28:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1110E6103D; Mon, 18 Oct 2021 10:26:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634552791; bh=ay2dJkSWk8dvggCwDM2rFTldFfZHxJ1l8l8yY5Ebeqk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=lySFvHpQ4quAbHwn3m0kiK+OCNz9N6Rk0AMNZFjmT+1UfkGCvXlaoQt3vvl8V+0B4 PLO4j+DLFHRYMFCJI/b76JfdbQPw6zq+H2UiskimnNn4rOjUG92O6DSQvu5KPeDXKW +kMg9XejnQfMKSd6+J52IvPGSv5ubDN+AEUiccSC9SlivZh23PgN8sycQb/lNFlfnk O3ji/LAsTvuu0w0mKDY1k8F7yKGaPx0Vj/Xazg5gd1SpmjMmyoNLzzeWIi64NuTgs5 2pG2dtUnOceXB9asJTb1dPuFSjiUIt00wjeYp2InDl72BJl1H2+CwZ90+TgE3IraTX ezmiA/DephvDQ== Date: Mon, 18 Oct 2021 13:26:25 +0300 From: Mike Rapoport To: Stephen Rothwell Cc: Andrew Morton , Masami Hiramatsu , "Steven Rostedt (VMware)" , Mike Rapoport , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: build failure after merge of the akpm-current tree Message-ID: References: <20211018192940.3d1d532f@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211018192940.3d1d532f@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org 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 > 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 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.