git: a9f2f92322f2 - main - arm64: Fix jump to wrong label in case of 0 entries
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 06 Jan 2026 11:04:30 UTC
The branch main has been updated by andrew:
URL: https://cgit.FreeBSD.org/src/commit/?id=a9f2f92322f211921b955b13b088624efe7f901a
commit a9f2f92322f211921b955b13b088624efe7f901a
Author: Marian Cingel <cingel.marian@gmail.com>
AuthorDate: 2026-01-03 14:45:27 +0000
Commit: Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2026-01-06 10:36:37 +0000
arm64: Fix jump to wrong label in case of 0 entries
Broke qemu-system-aarch6 boot with VIRT kernconf
PR: 292156
Fixes: ea8dc498aa8e ("arm64: Create an L3 table to limit permissions")
Signed-off-by: Marian Cingel <cingel.marian@gmail.com>
Pull Request: https://github.com/freebsd/freebsd-src/pull/1943
---
sys/arm64/arm64/locore.S | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S
index c22d5fe76468..46d3bac576e8 100644
--- a/sys/arm64/arm64/locore.S
+++ b/sys/arm64/arm64/locore.S
@@ -997,7 +997,7 @@ LEND(link_l2_pagetable)
* VA start (x8) modulo L3C_SIZE must equal PA start (x9) modulo L3C_SIZE.
*/
LENTRY(build_l3_page_pagetable)
- cbz x10, 2f
+ cbz x10, 4f
/*
* Build the L3 table entry.
*/
@@ -1037,7 +1037,7 @@ LENTRY(build_l3_page_pagetable)
add x11, x11, #1
add x9, x9, #1
cbnz x10, 1b
-2:
+4:
ret
LEND(build_l3_page_pagetable)