The branch stable/12 has been updated by markj:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=9be66886747651104235642e457b23b7fa090cb0

commit 9be66886747651104235642e457b23b7fa090cb0
Author:     Mark Johnston <[email protected]>
AuthorDate: 2021-03-24 13:55:22 +0000
Commit:     Mark Johnston <[email protected]>
CommitDate: 2021-03-31 13:16:58 +0000

    amd64: Make KPDPphys local to pmap.c
    
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit 7ae2e703366e5ac56373509ececae53ecaa5bc59)
---
 sys/amd64/amd64/pmap.c   | 2 +-
 sys/amd64/include/pmap.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index d67823729a48..c6f56c1cd73b 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -383,7 +383,7 @@ static int pat_index[PAT_INDEX_SIZE];       /* cache mode 
to PAT index conversion */
 
 static u_int64_t       KPTphys;        /* phys addr of kernel level 1 */
 static u_int64_t       KPDphys;        /* phys addr of kernel level 2 */
-u_int64_t              KPDPphys;       /* phys addr of kernel level 3 */
+static u_int64_t       KPDPphys;       /* phys addr of kernel level 3 */
 u_int64_t              KPML4phys;      /* phys addr of kernel level 4 */
 
 static u_int64_t       DMPDphys;       /* phys addr of direct mapped level 2 */
diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index 7176e9c6ef4d..3520594de9bd 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -274,7 +274,6 @@ typedef u_int64_t pml4_entry_t;
 #define        PML4pml4e       ((pd_entry_t *)(addr_PML4pml4e))
 
 extern int nkpt;               /* Initial number of kernel page tables */
-extern u_int64_t KPDPphys;     /* physical address of kernel level 3 */
 extern u_int64_t KPML4phys;    /* physical address of kernel level 4 */
 
 /*
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to