[src/trunk]: src/sys/arch x86: Move struct vm_page_md to common x86/pmap.h.

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/093d4fa79f71
branches:  trunk
changeset: 369527:093d4fa79f71
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Aug 20 23:18:20 2022 +0000

description:
x86: Move struct vm_page_md to common x86/pmap.h.

diffstat:

 sys/arch/amd64/include/pmap.h |  13 +------------
 sys/arch/i386/include/pmap.h  |  13 +------------
 sys/arch/x86/include/pmap.h   |  11 ++++++++++-
 3 files changed, 12 insertions(+), 25 deletions(-)

diffs (77 lines):

diff -r fe1410119d9f -r 093d4fa79f71 sys/arch/amd64/include/pmap.h
--- a/sys/arch/amd64/include/pmap.h     Sat Aug 20 23:15:36 2022 +0000
+++ b/sys/arch/amd64/include/pmap.h     Sat Aug 20 23:18:20 2022 +0000
@@ -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 @@
 
 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>
diff -r fe1410119d9f -r 093d4fa79f71 sys/arch/i386/include/pmap.h
--- a/sys/arch/i386/include/pmap.h      Sat Aug 20 23:15:36 2022 +0000
+++ b/sys/arch/i386/include/pmap.h      Sat Aug 20 23:18:20 2022 +0000
@@ -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 @@
 
 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_ */
diff -r fe1410119d9f -r 093d4fa79f71 sys/arch/x86/include/pmap.h
--- a/sys/arch/x86/include/pmap.h       Sat Aug 20 23:15:36 2022 +0000
+++ b/sys/arch/x86/include/pmap.h       Sat Aug 20 23:18:20 2022 +0000
@@ -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 @@
 
 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_ */