Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp3199611rwr; Sat, 29 Apr 2023 02:43:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7VTKlqyP/GYiB22gc2Gn2G9sX4OwzTmjy8vf7H36Jw/NgEvyiiI17qdyb3Y3ZOJeF2cZOP X-Received: by 2002:a17:902:d481:b0:1a0:53ba:ff1f with SMTP id c1-20020a170902d48100b001a053baff1fmr9406425plg.0.1682761386104; Sat, 29 Apr 2023 02:43:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682761386; cv=none; d=google.com; s=arc-20160816; b=NH4r7/+GJs5spwwOlnruvR8wuQ1Fg3Lmj7a4Lvnf2CWd8DCiTB8k4z27jJm4on5kby NdzhLilJjeU84KrALUu2WN0TZhMwwfo5l/0q05LujiiATC/Z26/Nu76Kpg72IfHxIrY9 5N0m2SvB2BnljJPo/kT8ZqGpm9179wk8FQhaX81/mg4jStjfoQYDwqLNUpLAKetxbsKq HmiRbwFDV2FISv/LrC7S31t7xQEddGNTw8u1GsQ9YSvwToxhdiY/cEre+qwpG3xLxZ1J DUjKqZK4WXwvDqp/+73u0RXzNMHtaZnWAw7Ep33hKC6bOarc3xxXf4D7RTGYCzMLoGC9 bOmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=5/C3U49h2pMlxtpS7xxhbMnR/p7P1CiiJgxO1nP9t0E=; b=I07oOQ4lS8LjyOHot/gbbeY5Wb0QD2o/Lc5FYUEr4imdqxvNJpFb2oiM2qugHO4O1d mtAQqo2QkkuLhNUjAU+bjQRVQz4BnJspcvnG9Hne5ohkWk0u02vok0gDt4L8feemqKhs lNuJ12cQx8NuRqjfxz9ES+Y0aEyYTUFYk5fnEXOcftv+iAaFAN0Tr9+PP5sd0I8ZXoub rzrsWCF4d9Q5X4joUBHdt8dtvxQXIxROjoyjC7NaSZXDLHOIDwgNqjeLe99pG1UOkSb4 Vu8V4BSneF8JJsDeZLw7+WhXqZsmSUdhp/j8EWyQC5ZKfQSNt0ZgEF1W332VB+aLsjn6 zSaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rIuKB6f9; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p11-20020a170902e74b00b001a1956e542dsi24746834plf.340.2023.04.29.02.42.54; Sat, 29 Apr 2023 02:43:06 -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=@kernel.org header.s=k20201202 header.b=rIuKB6f9; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230414AbjD2J2V (ORCPT + 99 others); Sat, 29 Apr 2023 05:28:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230351AbjD2J2S (ORCPT ); Sat, 29 Apr 2023 05:28:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F13F91FED for ; Sat, 29 Apr 2023 02:28:16 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 90B2F61028 for ; Sat, 29 Apr 2023 09:28:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 21F0EC433EF; Sat, 29 Apr 2023 09:28:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682760496; bh=VWFkSOEdLdYHiOdgaiiVB7fGkgZE49crp4dpjlI65Pc=; h=From:To:Cc:Subject:Date:From; b=rIuKB6f9FU/nOuER/hZBfRxBtPrbmVPSaatDgZSQTuMxIruWz+zyg6uN+AVpLrbwg ebwOVS4j6jzTn7iSCRogr8mssHL6IQJpzrdZgXPtY0jzlXNPSADDb/gCkRELWtQbvg 198idl0zmdk2zXNL3MdgLVggZpwemYkSF/PkPZz3OtEDz+UFMvRaRIl5PYoFTu2PLL Aj3fWqQpWcbf+LTJsyXEjfaQ+sOWgU9/0xBSkdT7Xy97Glwr+Ngjuh7jK+RjyGJmpH jQLwddcGImZH/FuEXb1J3e7p+Zta8GKtbhIgEx2hEBcUzq7hmpKj+uIfHWa3OYc3vt 9KTHdmaIMpZEg== From: Conor Dooley To: palmer@dabbelt.com Cc: conor@kernel.org, Conor Dooley , Lukas Bulwhan , Linus Torvalds , Andrew Morton , "Aneesh Kumar K . V" , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] RISC-V: fixup in-flight collision with ARCH_WANT_OPTIMIZE_VMEMMAP rename Date: Sat, 29 Apr 2023 10:27:33 +0100 Message-Id: <20230429-trilogy-jolly-12bf5c53d62d@spud> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1730; i=conor.dooley@microchip.com; h=from:subject:message-id; bh=za3FgcteiUKmO+H+px6+yeLYMnrjzvzxzBnY3YJjDjs=; b=owGbwMvMwCFWscWwfUFT0iXG02pJDCk+j5nlwlhrWx1mp2WnevlaT5OJLjq8msNet8duVwHP4 d/aD106SlkYxDgYZMUUWRJv97VIrf/jssO55y3MHFYmkCEMXJwCMJGY7YwML+Kf1SiVv3kqbHJq 8n7pBtX7Lk56rHmXVeo5lwq/CugNZ2S45nD2olPVyTt908PnnVt7gaOb+f0WE58jIsedd77gXn6 FDwA= X-Developer-Key: i=conor.dooley@microchip.com; a=openpgp; fpr=F9ECA03CF54F12CD01F1655722E2C55B37CF380C Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 From: Conor Dooley Lukas warned that ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP had been renamed in the mm tree & that RISC-V would need a fixup as part of the merge. The warning was missed however, and RISC-V is selecting the orphaned Kconfig option. Fixes: 89d77f71f493 ("Merge tag 'riscv-for-linus-6.4-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux") Reported-by: Lukas Bulwhan Link: https://lore.kernel.org/linux-riscv/CAKXUXMyVeg2kQK_edKHtMD3eADrDK_PKhCSVkMrLDdYgTQQ5rg@mail.gmail.com/ Signed-off-by: Conor Dooley --- I guess you picking this up for your second PR makes the most sense Palmer? CC: Palmer Dabbelt CC: Linus Torvalds CC: Andrew Morton CC: Aneesh Kumar K.V CC: Lukas Bulwhan CC: linux-riscv@lists.infradead.org CC: linux-kernel@vger.kernel.org --- arch/riscv/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 5c88ac4b52be..e1bdb3fb16cc 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -46,9 +46,9 @@ config RISCV select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU select ARCH_WANT_FRAME_POINTERS select ARCH_WANT_GENERAL_HUGETLB if !RISCV_ISA_SVNAPOT - select ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP select ARCH_WANT_HUGE_PMD_SHARE if 64BIT select ARCH_WANT_LD_ORPHAN_WARN if !XIP_KERNEL + select ARCH_WANT_OPTIMIZE_VMEMMAP select ARCH_WANTS_THP_SWAP if HAVE_ARCH_TRANSPARENT_HUGEPAGE select BINFMT_FLAT_NO_DATA_START_OFFSET if !MMU select BUILDTIME_TABLE_SORT if MMU -- 2.39.2