diff mbox series

[RFC,v2,15/21] riscv: mm: Adjust FIX_BTMAPS_SLOTS for variable PAGE_SIZE

Message ID 20241205103729.14798-16-luxu.kernel@bytedance.com (mailing list archive)
State New
Headers show
Series riscv: Introduce 64K base page | expand

Checks

Context Check Description
conchuod/vmtest-for-next-PR fail PR summary
conchuod/patch-15-test-1 success .github/scripts/patches/tests/build_rv32_defconfig.sh took 208.55s
conchuod/patch-15-test-2 success .github/scripts/patches/tests/build_rv64_clang_allmodconfig.sh took 1401.75s
conchuod/patch-15-test-3 success .github/scripts/patches/tests/build_rv64_gcc_allmodconfig.sh took 1609.81s
conchuod/patch-15-test-4 success .github/scripts/patches/tests/build_rv64_nommu_k210_defconfig.sh took 78.65s
conchuod/patch-15-test-5 success .github/scripts/patches/tests/build_rv64_nommu_virt_defconfig.sh took 81.15s
conchuod/patch-15-test-6 warning .github/scripts/patches/tests/checkpatch.sh took 0.48s
conchuod/patch-15-test-7 success .github/scripts/patches/tests/dtb_warn_rv64.sh took 48.45s
conchuod/patch-15-test-8 success .github/scripts/patches/tests/header_inline.sh took 0.01s
conchuod/patch-15-test-9 success .github/scripts/patches/tests/kdoc.sh took 0.66s
conchuod/patch-15-test-10 success .github/scripts/patches/tests/module_param.sh took 0.01s
conchuod/patch-15-test-11 success .github/scripts/patches/tests/verify_fixes.sh took 0.00s
conchuod/patch-15-test-12 success .github/scripts/patches/tests/verify_signedoff.sh took 0.04s
conchuod/vmtest-fixes-PR fail merge-conflict

Commit Message

Xu Lu Dec. 5, 2024, 10:37 a.m. UTC
Signed-off-by: Xu Lu <luxu.kernel@bytedance.com>
---
 arch/riscv/include/asm/fixmap.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/arch/riscv/include/asm/fixmap.h b/arch/riscv/include/asm/fixmap.h
index 0a55099bb734..17bf31334bd5 100644
--- a/arch/riscv/include/asm/fixmap.h
+++ b/arch/riscv/include/asm/fixmap.h
@@ -44,7 +44,8 @@  enum fixed_addresses {
 	 * before ioremap() is functional.
 	 */
 #define NR_FIX_BTMAPS		(SZ_256K / PAGE_SIZE)
-#define FIX_BTMAPS_SLOTS	7
+#define FIX_BTMAPS_SIZE		(FIXADDR_SIZE - ((FIX_BTMAP_END + 1) << PAGE_SHIFT))
+#define FIX_BTMAPS_SLOTS	(FIX_BTMAPS_SIZE / SZ_256K)
 #define TOTAL_FIX_BTMAPS	(NR_FIX_BTMAPS * FIX_BTMAPS_SLOTS)
 
 	FIX_BTMAP_END = __end_of_permanent_fixed_addresses,