diff options
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/i386/machdep.c | 3 | ||||
| -rw-r--r-- | sys/i386/i386/pmap.c | 11 | ||||
| -rw-r--r-- | sys/i386/i386/vm_machdep.c | 3 | ||||
| -rw-r--r-- | sys/i386/include/pmap.h | 3 |
4 files changed, 6 insertions, 14 deletions
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index c637aff9..37fe7fb 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.129 1995/06/26 07:39:52 bde Exp $ + * $Id: machdep.c,v 1.130 1995/06/28 04:46:11 davidg Exp $ */ #include "npx.h" @@ -77,6 +77,7 @@ #include <vm/vm.h> #include <vm/vm_kern.h> #include <vm/vm_page.h> +#include <vm/vm_pager.h> #include <sys/exec.h> #include <sys/vnode.h> diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 9971603..0a84c05 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $Id: pmap.c,v 1.57 1995/05/11 19:26:11 rgrimes Exp $ + * $Id: pmap.c,v 1.58 1995/05/30 07:59:38 rgrimes Exp $ */ /* @@ -369,7 +369,6 @@ pmap_bootstrap(firstaddr, loadaddr) kernel_pmap->pm_pdir = (pd_entry_t *) (KERNBASE + IdlePTD); - simple_lock_init(&kernel_pmap->pm_lock); kernel_pmap->pm_count = 1; nkpt = NKPT; @@ -535,7 +534,6 @@ pmap_pinit(pmap) ((int) pmap_kextract((vm_offset_t) pmap->pm_pdir)) | PG_V | PG_KW; pmap->pm_count = 1; - simple_lock_init(&pmap->pm_lock); } /* @@ -605,9 +603,7 @@ pmap_destroy(pmap) if (pmap == NULL) return; - simple_lock(&pmap->pm_lock); count = --pmap->pm_count; - simple_unlock(&pmap->pm_lock); if (count == 0) { pmap_release(pmap); free((caddr_t) pmap, M_VMPMAP); @@ -634,9 +630,7 @@ pmap_reference(pmap) pmap_t pmap; { if (pmap != NULL) { - simple_lock(&pmap->pm_lock); pmap->pm_count++; - simple_unlock(&pmap->pm_lock); } } @@ -1469,8 +1463,6 @@ pmap_object_init_pt(pmap, addr, object, offset, size) (object->resident_page_count > (MAX_INIT_PT / NBPG)))) { return; } - if (!vm_object_lock_try(object)) - return; /* * if we are processing a major portion of the object, then scan the @@ -1520,7 +1512,6 @@ pmap_object_init_pt(pmap, addr, object, offset, size) } } } - vm_object_unlock(object); } #if 0 diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index 2ff3602..c73e86e 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $Id: vm_machdep.c,v 1.38 1995/05/18 09:17:07 davidg Exp $ + * $Id: vm_machdep.c,v 1.39 1995/05/30 07:59:46 rgrimes Exp $ */ #include "npx.h" @@ -56,6 +56,7 @@ #include <vm/vm.h> #include <vm/vm_kern.h> +#include <vm/vm_page.h> #include <i386/isa/isa.h> diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h index 6a35c05..654f4ba 100644 --- a/sys/i386/include/pmap.h +++ b/sys/i386/include/pmap.h @@ -42,7 +42,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $Id: pmap.h,v 1.25 1995/03/26 23:42:55 davidg Exp $ + * $Id: pmap.h,v 1.26 1995/05/30 08:00:48 rgrimes Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -148,7 +148,6 @@ struct pmap { boolean_t pm_pdchanged; /* pdir changed */ short pm_dref; /* page directory ref count */ short pm_count; /* pmap reference count */ - simple_lock_data_t pm_lock; /* lock on pmap */ struct pmap_statistics pm_stats; /* pmap statistics */ long pm_ptpages; /* more stats: PT pages */ }; |
