From: Palmer Dabbelt <palmer@rivosinc.com>
To: linux-riscv@lists.infradead.org, rdunlap@infradead.org
Cc: Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
aou@eecs.berkeley.edu, anup@brainfault.org,
vincent.chen@sifive.com, guoren@kernel.org,
Atish Patra <atishp@rivosinc.com>,
alexandre.ghiti@canonical.com, jszhang@kernel.org,
vitaly.wool@konsulko.com, gatecat@ds0.me,
wangkefeng.wang@huawei.com, mick@ics.forth.gr,
panqinglin2020@iscas.ac.cn, rppt@kernel.org,
linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org,
linux@rivosinc.com, Palmer Dabbelt <palmer@rivosinc.com>
Subject: [PATCH v2 4/4] RISC-V: Fix the XIP build
Date: Wed, 20 Apr 2022 11:40:56 -0700 [thread overview]
Message-ID: <20220420184056.7886-5-palmer@rivosinc.com> (raw)
In-Reply-To: <20220420184056.7886-1-palmer@rivosinc.com>
From: Palmer Dabbelt <palmer@rivosinc.com>
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")
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
---
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 7bc9a21e29fb..d2054a6cd791 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -660,7 +660,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.34.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2022-04-20 18:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-20 18:40 [PATCH v2 0/4] RISC-V: Various XIP fixes Palmer Dabbelt
2022-04-20 18:40 ` [PATCH v2 1/4] RISC-V: Avoid empty create_*_mapping definitions Palmer Dabbelt
2022-04-20 22:11 ` Andreas Schwab
2022-05-25 21:32 ` Palmer Dabbelt
2022-04-20 18:40 ` [PATCH v2 2/4] RISC-V: ignore xipImage Palmer Dabbelt
2022-04-21 6:26 ` Guo Ren
2022-04-20 18:40 ` [PATCH v2 3/4] RISC-V: Split out the XIP fixups into their own file Palmer Dabbelt
2022-04-21 6:45 ` Guo Ren
2022-05-25 21:45 ` Palmer Dabbelt
2022-04-20 18:40 ` Palmer Dabbelt [this message]
2022-04-21 6:46 ` [PATCH v2 4/4] RISC-V: Fix the XIP build Guo Ren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220420184056.7886-5-palmer@rivosinc.com \
--to=palmer@rivosinc.com \
--cc=alexandre.ghiti@canonical.com \
--cc=anup@brainfault.org \
--cc=aou@eecs.berkeley.edu \
--cc=atishp@rivosinc.com \
--cc=gatecat@ds0.me \
--cc=guoren@kernel.org \
--cc=jszhang@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux@rivosinc.com \
--cc=mick@ics.forth.gr \
--cc=palmer@dabbelt.com \
--cc=panqinglin2020@iscas.ac.cn \
--cc=paul.walmsley@sifive.com \
--cc=rdunlap@infradead.org \
--cc=rppt@kernel.org \
--cc=vincent.chen@sifive.com \
--cc=vitaly.wool@konsulko.com \
--cc=wangkefeng.wang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox