From patchwork Fri Oct 14 01:42:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 2458 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp568513wrs; Thu, 13 Oct 2022 18:46:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4uXcdDexA/ANn684ryAzJG6P/DFiXXr+c3lxMOFx3wmo18Dc0z8i4OI63q+3gcMoKrD+GO X-Received: by 2002:a50:ed86:0:b0:458:e1da:af2 with SMTP id h6-20020a50ed86000000b00458e1da0af2mr2112125edr.364.1665711978139; Thu, 13 Oct 2022 18:46:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665711978; cv=none; d=google.com; s=arc-20160816; b=lozFWAZy5SqAXDGl2RYC90nFGDLGKs4Sm+Qhd7VpnIIySF/ZJ1v9WGiCXrKsSCJ/JA 1baNBL3s7K781zaTYtqHwwhHglJr0QAIyz7fkblorplMjN2QQMG5w7ffb2p0G16khui4 xUQG4doI9yRAmqGCrdCsnG2VohvZF7Aj08gkK+xAFE1pizECYzcNMy3BckYpaw7tasnm Dyj8t574CjKbg8D8wV7XaWNUJp509NP+ekfNNwhgwjIrXAWpFOlLiUz1KolI2EU7OUbG WqLva0CZ34dIXWt1nzBVZ8WdPZnNjbFswmVBjs6kf3tus7I5IEPGv5Ljp8SfWd2hmL6p QW3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=UOqOv9ZXTG50TVbS4bfjEnoDOx+u6Ff5Z3TJqIYC0jM=; b=L5tRuXm4Xp3vEsltjT7tmnf+aBxoRJZDnOjd4/QEDv2XKjC7w5f3nSiU5LZXQmYg+2 4gBHeKKf6jlaG2kvENb0Zaw0MTlmusvLbJRbm7Spudxt3CDzCRRCG9dN6G+Znvx/3U9y Vg21B5FXCUyNy9UcxDE1Or1QH+mvvj59ujiGN9aXXsuMMsMWKhxAnlEXS5PW8U5xXPgk pJN1pfXbAWqL2uAg6Lc8mhQH3drbH6Uu/gdEiLvuE2bXIGE6sFbSwPxCoa0H0p8euZGu dQNVlxYTCzfuB2oFsvo08Ic+CQEossjFFWzYBbnanoLZAyjFP7g4NMagVOSh6QjoPdzn ihRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=EMIVKjO8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e22-20020a1709067e1600b0073da5c8de1asi1216337ejr.178.2022.10.13.18.45.53; Thu, 13 Oct 2022 18:46:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=EMIVKjO8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229686AbiJNBm0 (ORCPT + 99 others); Thu, 13 Oct 2022 21:42:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229471AbiJNBmY (ORCPT ); Thu, 13 Oct 2022 21:42:24 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BCB819C05C; Thu, 13 Oct 2022 18:42:21 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4MpTf40d6qz4wgr; Fri, 14 Oct 2022 12:42:20 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1665711740; bh=UOqOv9ZXTG50TVbS4bfjEnoDOx+u6Ff5Z3TJqIYC0jM=; h=Date:From:To:Cc:Subject:From; b=EMIVKjO8LK58j+wxxvgH1hUKrT5GwGFk1uj+JFlahxWZZkD2tN5O1/wSNObWNfcHD AOXqMGEMNWM/9bwRNisei+VYUj2TfCOniuAvZAdN0uiVlT/Qca/C2IJVdjvPTAuaG4 tnXivgttxtNfST1NJkcU26kMNrhk+Dg+bszVLc95ti2Tl/V36W6GkVYKH9BmCrLSVU B6tqUW8fXzQmnCL+kMK2c9+EKS4PgVShOpYzyqGHbIUb23J3kQ67+BqOSTuy1NOLtd vDBmAQBE4Mm2WUb2dGBx6gY4w5uBXX38O1OCKody0sJPvi4U3TpT9U4GzWEoo32Zs9 g7hu8G/wvR3qQ== Date: Fri, 14 Oct 2022 12:42:17 +1100 From: Stephen Rothwell To: Masahiro Yamada Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the kbuild tree Message-ID: <20221014124217.20fd0a27@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746625603044910110?= X-GMAIL-MSGID: =?utf-8?q?1746625603044910110?= Hi all, After merging the kbuild tree, today's linux-next build (i386 defconfig) failed like this: In file included from arch/x86/kernel/head_32.S:29: arch/x86/include/asm/pgtable_32.h:68:5: error: "PTRS_PER_PMD" is not defined, evaluates to 0 [-Werror=undef] 68 | #if PTRS_PER_PMD > 1 | ^~~~~~~~~~~~ cc1: all warnings being treated as errors Exposed by commit 0a7606a9832a ("kbuild: move -Wundef from KBUILD_CFLAGS to KBUILD_CPPFLAGS") I have no idea what the root cause is. :-( It is a great pity that this commit was not in linux-next before the merge window opened. :-( I have applied the following hack for today. From: Stephen Rothwell Date: Fri, 14 Oct 2022 12:34:34 +1100 Subject: [PATCH] i386: hack for "kbuild: move -Wundef from KBUILD_CFLAGS to KBUILD_CPPFLAGS" Signed-off-by: Stephen Rothwell --- arch/x86/include/asm/pgtable_32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h index 7c9c968a42ef..0f3f186ca140 100644 --- a/arch/x86/include/asm/pgtable_32.h +++ b/arch/x86/include/asm/pgtable_32.h @@ -65,7 +65,7 @@ do { \ * With PAE paging (PTRS_PER_PMD > 1), we allocate PTRS_PER_PGD == 4 pages for * the PMD's in addition to the pages required for the last level pagetables. */ -#if PTRS_PER_PMD > 1 +#if defined(PTRS_PER_PMD) && (PTRS_PER_PMD > 1) #define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD) #else #define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)