summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/alpha/include/vmparam.h3
-rw-r--r--sys/arch/amd64/include/vmparam.h3
-rw-r--r--sys/arch/arm/include/vmparam.h3
-rw-r--r--sys/arch/hppa/include/vmparam.h3
-rw-r--r--sys/arch/hppa64/include/vmparam.h3
-rw-r--r--sys/arch/i386/include/vmparam.h3
-rw-r--r--sys/arch/m68k/include/vmparam.h3
-rw-r--r--sys/arch/m88k/include/vmparam.h3
-rw-r--r--sys/arch/macppc/include/vmparam.h3
-rw-r--r--sys/arch/mips64/include/vmparam.h3
-rw-r--r--sys/arch/sh/include/vmparam.h3
-rw-r--r--sys/arch/socppc/include/vmparam.h3
-rw-r--r--sys/arch/sparc/include/vmparam.h3
-rw-r--r--sys/arch/sparc64/include/vmparam.h3
-rw-r--r--sys/arch/vax/include/vmparam.h3
-rw-r--r--sys/uvm/uvm_map.c6
-rw-r--r--sys/uvm/uvm_page.c6
-rw-r--r--sys/uvm/uvm_page.h5
18 files changed, 19 insertions, 43 deletions
diff --git a/sys/arch/alpha/include/vmparam.h b/sys/arch/alpha/include/vmparam.h
index cd37e12ebb3..ecb214aee77 100644
--- a/sys/arch/alpha/include/vmparam.h
+++ b/sys/arch/alpha/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.23 2014/01/01 22:13:52 miod Exp $ */
+/* $OpenBSD: vmparam.h,v 1.24 2014/01/23 22:06:29 miod Exp $ */
/* $NetBSD: vmparam.h,v 1.18 2000/05/22 17:13:54 thorpej Exp $ */
/*
@@ -128,7 +128,6 @@
/*
* pmap-specific data stored in the vm_page structure.
*/
-#define __HAVE_VM_PAGE_MD
struct vm_page_md {
struct pv_entry *pvh_list; /* pv entry list */
int pvh_attrs; /* page attributes */
diff --git a/sys/arch/amd64/include/vmparam.h b/sys/arch/amd64/include/vmparam.h
index 6a70e082c2f..bd4b65595c8 100644
--- a/sys/arch/amd64/include/vmparam.h
+++ b/sys/arch/amd64/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.16 2013/01/27 16:12:16 fgsch Exp $ */
+/* $OpenBSD: vmparam.h,v 1.17 2014/01/23 22:06:29 miod Exp $ */
/* $NetBSD: vmparam.h,v 1.1 2003/04/26 18:39:49 fvdl Exp $ */
/*-
@@ -110,7 +110,6 @@
#define VM_PHYSSEG_STRAT VM_PSTRAT_BIGFIRST
#define VM_PHYSSEG_NOADD /* can't add RAM after vm_mem_init */
-#define __HAVE_VM_PAGE_MD
struct pv_entry;
struct vm_page_md {
struct pv_entry *pv_list;
diff --git a/sys/arch/arm/include/vmparam.h b/sys/arch/arm/include/vmparam.h
index 29e2c9ed2f9..5eb0e3ccabf 100644
--- a/sys/arch/arm/include/vmparam.h
+++ b/sys/arch/arm/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $ */
+/* $OpenBSD: vmparam.h,v 1.9 2014/01/23 22:06:29 miod Exp $ */
/* $NetBSD: vmparam.h,v 1.18 2003/05/21 18:04:44 thorpej Exp $ */
/*
@@ -106,7 +106,6 @@
/*
* pmap-specific data store in the vm_page structure.
*/
-#define __HAVE_VM_PAGE_MD
struct vm_page_md {
struct pv_entry *pvh_list; /* pv_entry list */
struct simplelock pvh_slock; /* lock on this head */
diff --git a/sys/arch/hppa/include/vmparam.h b/sys/arch/hppa/include/vmparam.h
index c9afa3c0e29..e6755fa0b70 100644
--- a/sys/arch/hppa/include/vmparam.h
+++ b/sys/arch/hppa/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.39 2011/11/10 22:48:13 deraadt Exp $ */
+/* $OpenBSD: vmparam.h,v 1.40 2014/01/23 22:06:29 miod Exp $ */
/*
* Copyright (c) 1988-1994, The University of Utah and
@@ -96,7 +96,6 @@
#include <sys/lock.h>
-#define __HAVE_VM_PAGE_MD
struct pv_entry;
struct vm_page_md {
struct simplelock pvh_lock; /* locks every pv on this list */
diff --git a/sys/arch/hppa64/include/vmparam.h b/sys/arch/hppa64/include/vmparam.h
index a6d03e4ebe3..6023b207ade 100644
--- a/sys/arch/hppa64/include/vmparam.h
+++ b/sys/arch/hppa64/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.7 2011/11/14 14:29:57 deraadt Exp $ */
+/* $OpenBSD: vmparam.h,v 1.8 2014/01/23 22:06:29 miod Exp $ */
/*
* Copyright (c) 1988-1994, The University of Utah and
@@ -96,7 +96,6 @@
#include <sys/lock.h>
-#define __HAVE_VM_PAGE_MD
struct pv_entry;
struct vm_page_md {
struct simplelock pvh_lock; /* locks every pv on this list */
diff --git a/sys/arch/i386/include/vmparam.h b/sys/arch/i386/include/vmparam.h
index 965dc966841..7c965880c47 100644
--- a/sys/arch/i386/include/vmparam.h
+++ b/sys/arch/i386/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.51 2013/03/25 19:33:11 deraadt Exp $ */
+/* $OpenBSD: vmparam.h,v 1.52 2014/01/23 22:06:29 miod Exp $ */
/* $NetBSD: vmparam.h,v 1.15 1994/10/27 04:16:34 cgd Exp $ */
/*-
@@ -117,7 +117,6 @@
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
#define VM_PHYSSEG_NOADD /* can't add RAM after vm_mem_init */
-#define __HAVE_VM_PAGE_MD
struct pv_entry;
struct vm_page_md {
struct pv_entry *pv_list;
diff --git a/sys/arch/m68k/include/vmparam.h b/sys/arch/m68k/include/vmparam.h
index fe45c8ac00c..5ce336af4a2 100644
--- a/sys/arch/m68k/include/vmparam.h
+++ b/sys/arch/m68k/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.11 2013/03/23 16:12:24 deraadt Exp $ */
+/* $OpenBSD: vmparam.h,v 1.12 2014/01/23 22:06:29 miod Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -137,7 +137,6 @@ struct pv_entry {
/* header: entry maps a page table page */
#define PV_PTPAGE (0x02 << PG_SHIFT)
-#define __HAVE_VM_PAGE_MD
struct vm_page_md {
struct pv_entry pvent;
};
diff --git a/sys/arch/m88k/include/vmparam.h b/sys/arch/m88k/include/vmparam.h
index 85a60fd4d09..b1acd526c43 100644
--- a/sys/arch/m88k/include/vmparam.h
+++ b/sys/arch/m88k/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.12 2013/02/20 05:08:41 miod Exp $ */
+/* $OpenBSD: vmparam.h,v 1.13 2014/01/23 22:06:29 miod Exp $ */
/*
* Mach Operating System
* Copyright (c) 1992 Carnegie Mellon University
@@ -99,7 +99,6 @@ struct pv_entry {
int pv_flags;
};
-#define __HAVE_VM_PAGE_MD
struct vm_page_md {
struct pv_entry pvent;
};
diff --git a/sys/arch/macppc/include/vmparam.h b/sys/arch/macppc/include/vmparam.h
index f6755dc1d45..b1f45019b4e 100644
--- a/sys/arch/macppc/include/vmparam.h
+++ b/sys/arch/macppc/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.23 2011/05/30 22:25:21 oga Exp $ */
+/* $OpenBSD: vmparam.h,v 1.24 2014/01/23 22:06:29 miod Exp $ */
/* $NetBSD: vmparam.h,v 1.1 1996/09/30 16:34:38 ws Exp $ */
/*-
@@ -103,7 +103,6 @@ extern vaddr_t ppc_kvm_stolen;
#ifdef _KERNEL
-#define __HAVE_VM_PAGE_MD
struct pv_entry;
struct vm_page_md {
LIST_HEAD(,pte_desc) pv_list;
diff --git a/sys/arch/mips64/include/vmparam.h b/sys/arch/mips64/include/vmparam.h
index 5589395747c..17e59f5aece 100644
--- a/sys/arch/mips64/include/vmparam.h
+++ b/sys/arch/mips64/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.24 2011/05/30 22:25:21 oga Exp $ */
+/* $OpenBSD: vmparam.h,v 1.25 2014/01/23 22:06:29 miod Exp $ */
/* $NetBSD: vmparam.h,v 1.5 1994/10/26 21:10:10 cgd Exp $ */
/*
@@ -121,7 +121,6 @@ typedef struct pv_entry {
vaddr_t pv_va; /* virtual address for mapping */
} *pv_entry_t;
-#define __HAVE_VM_PAGE_MD
struct vm_page_md {
struct pv_entry pv_ent; /* pv list of this seg */
};
diff --git a/sys/arch/sh/include/vmparam.h b/sys/arch/sh/include/vmparam.h
index 1c6f7b558d4..59dcf653a5d 100644
--- a/sys/arch/sh/include/vmparam.h
+++ b/sys/arch/sh/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.8 2010/12/15 05:30:19 tedu Exp $ */
+/* $OpenBSD: vmparam.h,v 1.9 2014/01/23 22:06:29 miod Exp $ */
/* $NetBSD: vmparam.h,v 1.17 2006/03/04 01:55:03 uwe Exp $ */
/*-
@@ -86,7 +86,6 @@
#define VM_PHYS_SIZE (USRIOSIZE * PAGE_SIZE)
/* pmap-specific data store in the vm_page structure. */
-#define __HAVE_VM_PAGE_MD
#define PVH_REFERENCED 1
#define PVH_MODIFIED 2
diff --git a/sys/arch/socppc/include/vmparam.h b/sys/arch/socppc/include/vmparam.h
index a30f6b8051f..05975b92504 100644
--- a/sys/arch/socppc/include/vmparam.h
+++ b/sys/arch/socppc/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.5 2011/05/30 22:25:22 oga Exp $ */
+/* $OpenBSD: vmparam.h,v 1.6 2014/01/23 22:06:29 miod Exp $ */
/* $NetBSD: vmparam.h,v 1.1 1996/09/30 16:34:38 ws Exp $ */
/*-
@@ -99,7 +99,6 @@ extern vaddr_t ppc_kvm_stolen;
#ifdef _KERNEL
-#define __HAVE_VM_PAGE_MD
struct pv_entry;
struct vm_page_md {
LIST_HEAD(,pte_desc) pv_list;
diff --git a/sys/arch/sparc/include/vmparam.h b/sys/arch/sparc/include/vmparam.h
index 1e39d85f0df..0d51ddf7362 100644
--- a/sys/arch/sparc/include/vmparam.h
+++ b/sys/arch/sparc/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.39 2012/07/01 15:31:35 miod Exp $ */
+/* $OpenBSD: vmparam.h,v 1.40 2014/01/23 22:06:29 miod Exp $ */
/* $NetBSD: vmparam.h,v 1.13 1997/07/12 16:20:03 perry Exp $ */
/*
@@ -118,7 +118,6 @@ struct pvlist {
int pv_flags; /* flags (below) */
};
-#define __HAVE_VM_PAGE_MD
struct vm_page_md {
struct pvlist pv_head;
};
diff --git a/sys/arch/sparc64/include/vmparam.h b/sys/arch/sparc64/include/vmparam.h
index 5446f793ccf..7cf65c04adf 100644
--- a/sys/arch/sparc64/include/vmparam.h
+++ b/sys/arch/sparc64/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.23 2011/05/30 22:25:22 oga Exp $ */
+/* $OpenBSD: vmparam.h,v 1.24 2014/01/23 22:06:30 miod Exp $ */
/* $NetBSD: vmparam.h,v 1.18 2001/05/01 02:19:19 thorpej Exp $ */
/*
@@ -115,7 +115,6 @@
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
#define VM_PHYSSEG_NOADD /* can't add RAM after vm_mem_init */
-#define __HAVE_VM_PAGE_MD
/*
* For each struct vm_page, there is a list of all currently valid virtual
* mappings of that page. An entry is a pv_entry_t, the list is pv_table.
diff --git a/sys/arch/vax/include/vmparam.h b/sys/arch/vax/include/vmparam.h
index 24dba6abb11..98ba01be5e8 100644
--- a/sys/arch/vax/include/vmparam.h
+++ b/sys/arch/vax/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.34 2013/11/24 22:09:58 miod Exp $ */
+/* $OpenBSD: vmparam.h,v 1.35 2014/01/23 22:06:30 miod Exp $ */
/* $NetBSD: vmparam.h,v 1.32 2000/03/07 00:05:59 matt Exp $ */
/*-
@@ -106,7 +106,6 @@
* This should be in <machine/pmap.h>, but needs to be in this file
* due to include ordering issues.
*/
-#define __HAVE_VM_PAGE_MD
struct vm_page_md {
struct pv_entry *pv_head;
diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c
index 949fbe4f081..f35a3864029 100644
--- a/sys/uvm/uvm_map.c
+++ b/sys/uvm/uvm_map.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_map.c,v 1.163 2013/09/21 10:01:27 miod Exp $ */
+/* $OpenBSD: uvm_map.c,v 1.164 2014/01/23 22:06:30 miod Exp $ */
/* $NetBSD: uvm_map.c,v 1.86 2000/11/27 08:40:03 chs Exp $ */
/*
@@ -2855,11 +2855,7 @@ uvm_page_printit(pg, full, pr)
#else
(*pr)(" [page ownership tracking disabled]");
#endif
-#ifdef __HAVE_VM_PAGE_MD
(*pr)("\tvm_page_md %p\n", &pg->mdpage);
-#else
- (*pr)("\n");
-#endif
if (!full)
return;
diff --git a/sys/uvm/uvm_page.c b/sys/uvm/uvm_page.c
index 875637496fb..de09dfc1bd3 100644
--- a/sys/uvm/uvm_page.c
+++ b/sys/uvm/uvm_page.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_page.c,v 1.128 2013/07/09 15:37:43 beck Exp $ */
+/* $OpenBSD: uvm_page.c,v 1.129 2014/01/23 22:06:30 miod Exp $ */
/* $NetBSD: uvm_page.c,v 1.44 2000/11/27 08:40:04 chs Exp $ */
/*
@@ -271,9 +271,7 @@ uvm_page_init(vaddr_t *kvm_startp, vaddr_t *kvm_endp)
for (i = 0, curpg = seg->pgs; i < n;
i++, curpg++, pgno++, paddr += PAGE_SIZE) {
curpg->phys_addr = paddr;
-#ifdef __HAVE_VM_PAGE_MD
VM_MDPAGE_INIT(curpg);
-#endif
if (pgno >= seg->avail_start &&
pgno <= seg->avail_end) {
uvmexp.npages++;
@@ -607,9 +605,7 @@ uvm_page_physload(paddr_t start, paddr_t end, paddr_t avail_start,
for (lcv = 0, paddr = ptoa(start); lcv < npages;
lcv++, paddr += PAGE_SIZE) {
pgs[lcv].phys_addr = paddr;
-#ifdef __HAVE_VM_PAGE_MD
VM_MDPAGE_INIT(&pgs[lcv]);
-#endif
if (atop(paddr) >= avail_start &&
atop(paddr) <= avail_end) {
if (flags & PHYSLOAD_DEVICE) {
diff --git a/sys/uvm/uvm_page.h b/sys/uvm/uvm_page.h
index 005b7001a39..06df8260523 100644
--- a/sys/uvm/uvm_page.h
+++ b/sys/uvm/uvm_page.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_page.h,v 1.51 2014/01/01 22:15:18 miod Exp $ */
+/* $OpenBSD: uvm_page.h,v 1.52 2014/01/23 22:06:30 miod Exp $ */
/* $NetBSD: uvm_page.h,v 1.19 2000/12/28 08:24:55 chs Exp $ */
/*
@@ -118,9 +118,8 @@ struct vm_page {
paddr_t phys_addr; /* physical address of page */
psize_t fpgsz; /* free page range size */
-#ifdef __HAVE_VM_PAGE_MD
struct vm_page_md mdpage; /* pmap-specific data */
-#endif
+
#if defined(UVM_PAGE_TRKOWN)
/* debugging fields to track page ownership */
pid_t owner; /* proc that set PG_BUSY */
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-08 17:53:51 +0000