The branch stable/13 has been updated by kib:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=5a84640fcf2763e1475aabc0f591384fb0d2c080

commit 5a84640fcf2763e1475aabc0f591384fb0d2c080
Author:     Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2021-07-10 19:51:16 +0000
Commit:     Konstantin Belousov <k...@freebsd.org>
CommitDate: 2021-08-03 09:52:37 +0000

    amd64 pti init: fix calculation of the kernel text start
    
    (cherry picked from commit 34516d4ad19b83e5dfe6ec8c1db232c422d7ecff)
---
 sys/amd64/amd64/pmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 9b95343f43f3..73850cbb376f 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -10636,7 +10636,7 @@ pmap_pti_init(void)
                va = __pcpu[i].pc_common_tss.tss_ist4 + sizeof(struct nmi_pcpu);
                pmap_pti_add_kva_locked(va - DBG_STACK_SIZE, va, false);
        }
-       pmap_pti_add_kva_locked((vm_offset_t)kernphys + KERNBASE,
+       pmap_pti_add_kva_locked((vm_offset_t)KERNBASE + NBPDR,
            (vm_offset_t)etext, true);
        pti_finalized = true;
        VM_OBJECT_WUNLOCK(pti_obj);
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"

Reply via email to