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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36688C43334 for ; Tue, 7 Jun 2022 22:07:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1383693AbiFGWHn (ORCPT ); Tue, 7 Jun 2022 18:07:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1383774AbiFGWGV (ORCPT ); Tue, 7 Jun 2022 18:06:21 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3E1C187C04; Tue, 7 Jun 2022 12:17:29 -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 ams.source.kernel.org (Postfix) with ESMTPS id 87F97B8237B; Tue, 7 Jun 2022 19:17:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F32EDC385A2; Tue, 7 Jun 2022 19:17:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654629447; bh=1ccXHXOLc5bkJrMUGd4dBgKunxzafld5r3Mry26Bbio=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rIq8Pt1R86TwpdAbB0GJSm5h1biTrSZ/9UQaRoImR4vAUhiezB3BskOpeq3nDqAz3 UTvEd9r3T/M2xpiIqz1VMyhpXbQVvq0cFmH/Im7szLVQDzHKu+qQlDKA07SimdlfMk yvektF9SykHNAwshFz53q2aZXrAQGIeQtOQpNQAU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guo Ren , Palmer Dabbelt , Sasha Levin Subject: [PATCH 5.18 694/879] RISC-V: Fix the XIP build Date: Tue, 7 Jun 2022 19:03:32 +0200 Message-Id: <20220607165022.991461845@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607165002.659942637@linuxfoundation.org> References: <20220607165002.659942637@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Palmer Dabbelt [ Upstream commit d9e418d0ca1c464fe361468b772d4aa870d54e63 ] A handful of functions unused functions were enabled during XIP builds, which themselves didn't build correctly. This just disables the functions entirely. Fixes: e8a62cc26ddf ("riscv: Implement sv48 support") Reviewed-by: Guo Ren Link: https://lore.kernel.org/r/20220420184056.7886-5-palmer@rivosinc.com Signed-off-by: Palmer Dabbelt Signed-off-by: Sasha Levin --- arch/riscv/mm/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 05ed641a1134..39e2e1d0e94f 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -677,7 +677,7 @@ static __init pgprot_t pgprot_from_va(uintptr_t va) } #endif /* CONFIG_STRICT_KERNEL_RWX */ -#ifdef CONFIG_64BIT +#if defined(CONFIG_64BIT) && !defined(CONFIG_XIP_KERNEL) static void __init disable_pgtable_l5(void) { pgtable_l5_enabled = false; -- 2.35.1