Module Name: src
Committed By: riastradh
Date: Sat Aug 20 23:18:20 UTC 2022
Modified Files:
src/sys/arch/amd64/include: pmap.h
src/sys/arch/i386/include: pmap.h
src/sys/arch/x86/include: pmap.h
Log Message:
x86: Move struct vm_page_md to common x86/pmap.h.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/amd64/include/pmap.h
cvs rdiff -u -r1.126 -r1.127 src/sys/arch/i386/include/pmap.h
cvs rdiff -u -r1.130 -r1.131 src/sys/arch/x86/include/pmap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/include/pmap.h
diff -u src/sys/arch/amd64/include/pmap.h:1.66 src/sys/arch/amd64/include/pmap.h:1.67
--- src/sys/arch/amd64/include/pmap.h:1.66 Fri May 15 22:17:45 2020
+++ src/sys/arch/amd64/include/pmap.h Sat Aug 20 23:18:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.66 2020/05/15 22:17:45 ad Exp $ */
+/* $NetBSD: pmap.h,v 1.67 2022/08/20 23:18:20 riastradh Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -307,17 +307,6 @@ pmap_direct_process(paddr_t pa, voff_t p
void pmap_changeprot_local(vaddr_t, vm_prot_t);
-#include <x86/pmap_pv.h>
-
-#define __HAVE_VM_PAGE_MD
-#define VM_MDPAGE_INIT(pg) \
- memset(&(pg)->mdpage, 0, sizeof((pg)->mdpage)); \
- PMAP_PAGE_INIT(&(pg)->mdpage.mp_pp)
-
-struct vm_page_md {
- struct pmap_page mp_pp;
-};
-
#else /* !__x86_64__ */
#include <i386/pmap.h>
Index: src/sys/arch/i386/include/pmap.h
diff -u src/sys/arch/i386/include/pmap.h:1.126 src/sys/arch/i386/include/pmap.h:1.127
--- src/sys/arch/i386/include/pmap.h:1.126 Sun Jul 19 13:55:09 2020
+++ src/sys/arch/i386/include/pmap.h Sat Aug 20 23:18:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.126 2020/07/19 13:55:09 maxv Exp $ */
+/* $NetBSD: pmap.h,v 1.127 2022/08/20 23:18:20 riastradh Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -400,15 +400,4 @@ struct pcb;
int pmap_exec_fixup(struct vm_map *, struct trapframe *, struct pcb *);
-#include <x86/pmap_pv.h>
-
-#define __HAVE_VM_PAGE_MD
-#define VM_MDPAGE_INIT(pg) \
- memset(&(pg)->mdpage, 0, sizeof((pg)->mdpage)); \
- PMAP_PAGE_INIT(&(pg)->mdpage.mp_pp)
-
-struct vm_page_md {
- struct pmap_page mp_pp;
-};
-
#endif /* _I386_PMAP_H_ */
Index: src/sys/arch/x86/include/pmap.h
diff -u src/sys/arch/x86/include/pmap.h:1.130 src/sys/arch/x86/include/pmap.h:1.131
--- src/sys/arch/x86/include/pmap.h:1.130 Sat Aug 20 23:15:37 2022
+++ src/sys/arch/x86/include/pmap.h Sat Aug 20 23:18:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.130 2022/08/20 23:15:37 riastradh Exp $ */
+/* $NetBSD: pmap.h,v 1.131 2022/08/20 23:18:20 riastradh Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -557,6 +557,15 @@ extern vaddr_t pmap_direct_end;
void svs_quad_copy(void *, void *, long);
+#define __HAVE_VM_PAGE_MD
+#define VM_MDPAGE_INIT(pg) \
+ memset(&(pg)->mdpage, 0, sizeof((pg)->mdpage)); \
+ PMAP_PAGE_INIT(&(pg)->mdpage.mp_pp)
+
+struct vm_page_md {
+ struct pmap_page mp_pp;
+};
+
#endif /* _KERNEL */
#endif /* _X86_PMAP_H_ */
