git: 8179f2a7753d - stable/14 - amd64 la57_trampoline: jump immediately after re-enabling paging
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 23 Sep 2024 13:03:41 UTC
The branch stable/14 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=8179f2a7753d51767d7dcaae53f8ba0d1dcdf8db
commit 8179f2a7753d51767d7dcaae53f8ba0d1dcdf8db
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2022-09-17 01:35:20 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-23 13:03:06 +0000
amd64 la57_trampoline: jump immediately after re-enabling paging
(cherry picked from commit 180c8ab079950acb15c6629ce293055ea0117b39)
---
sys/amd64/amd64/locore.S | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index e52d36125afd..a51e5047fe54 100644
--- a/sys/amd64/amd64/locore.S
+++ b/sys/amd64/amd64/locore.S
@@ -119,8 +119,9 @@ l1: movl $(3<<3),%eax
movl %edi,%cr3
movl %edx,%cr0
+ jmp 1f
- pushl $(1<<3)
+1: pushl $(1<<3)
pushl %ebx
lretl
.code64