Module Name: src
Committed By: maxv
Date: Wed Aug 29 06:28:51 UTC 2018
Modified Files:
src/sys/arch/amd64/include: pmap.h
src/sys/arch/x86/include: pmap.h
Log Message:
Remove the constants of the DMAP, they are unused, and move NL4_SLOT_DIRECT
into amd64/.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/amd64/include/pmap.h
cvs rdiff -u -r1.86 -r1.87 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.55 src/sys/arch/amd64/include/pmap.h:1.56
--- src/sys/arch/amd64/include/pmap.h:1.55 Mon Aug 20 15:04:51 2018
+++ src/sys/arch/amd64/include/pmap.h Wed Aug 29 06:28:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.55 2018/08/20 15:04:51 maxv Exp $ */
+/* $NetBSD: pmap.h,v 1.56 2018/08/29 06:28:50 maxv Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -97,6 +97,8 @@
#define NL4_SLOT_KASAN 32
#endif
+#define NL4_SLOT_DIRECT 32
+
#ifndef XEN
#define L4_SLOT_PTE slotspace.area[SLAREA_PTE].sslot
#else
@@ -167,7 +169,7 @@ extern pt_entry_t *pte_base;
#define PG_PVLIST PG_AVAIL2 /* mapping has entry on pvlist */
/* PG_AVAIL3 not used */
-#define PG_X 0 /* XXX dummy */
+#define PG_X 0 /* dummy */
void svs_pmap_sync(struct pmap *, int);
void svs_lwp_switch(struct lwp *, struct lwp *);
Index: src/sys/arch/x86/include/pmap.h
diff -u src/sys/arch/x86/include/pmap.h:1.86 src/sys/arch/x86/include/pmap.h:1.87
--- src/sys/arch/x86/include/pmap.h:1.86 Wed Aug 29 06:17:26 2018
+++ src/sys/arch/x86/include/pmap.h Wed Aug 29 06:28:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.86 2018/08/29 06:17:26 maxv Exp $ */
+/* $NetBSD: pmap.h,v 1.87 2018/08/29 06:28:50 maxv Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -569,13 +569,6 @@ extern struct pcpu_area *pcpuarea;
extern vaddr_t pmap_direct_base;
extern vaddr_t pmap_direct_end;
-#define L4_SLOT_DIRECT 456
-#define PDIR_SLOT_DIRECT L4_SLOT_DIRECT
-
-#define NL4_SLOT_DIRECT 32
-
-#define PMAP_DIRECT_DEFAULT_BASE (VA_SIGN_NEG((L4_SLOT_DIRECT * NBPD_L4)))
-
#define PMAP_DIRECT_BASE pmap_direct_base
#define PMAP_DIRECT_END pmap_direct_end
