Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Same change as -r1.133 of src/sys/arch/amiga/amiga/pmap.c :

Browse Source 
As per hint from ad@, change uvm.kernel_object to uvm_kernel_object,
  to adapt to the recent uvm changes.
This commit is contained in:
dogcow 2007-07-23 19:21:03 +00:00
parent cd917419d2
commit 0dfe89a6a7
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/arch/m68k/m68k/pmap_motorola.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap_motorola.c,v 1.32 2007/07/16 23:48:05 macallan Exp $ */
/* $NetBSD: pmap_motorola.c,v 1.33 2007/07/23 19:21:03 dogcow Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -124,7 +124,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.32 2007/07/16 23:48:05 macallan Exp $");
__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.33 2007/07/23 19:21:03 dogcow Exp $");
#include "opt_compat_hpux.h"
@ -2227,9 +2227,9 @@ pmap_remove_mapping(pmap_t pmap, vaddr_t va, pt_entry_t *pte, int flags)
#endif
pmap_remove_mapping(pmap_kernel(), ptpva,
NULL, PRM_TFLUSH|PRM_CFLUSH);
simple_lock(&uvm.kernel_object->vmobjlock);
simple_lock(&uvm_kernel_object->vmobjlock);
uvm_pagefree(PHYS_TO_VM_PAGE(ptppa));
simple_unlock(&uvm.kernel_object->vmobjlock);
simple_unlock(&uvm_kernel_object->vmobjlock);
PMAP_DPRINTF(PDB_REMOVE|PDB_PTPAGE,
("remove: PT page 0x%lx (0x%lx) freed\n",
ptpva, ptppa));
@ -2689,15 +2689,15 @@ pmap_enter_ptpage(pmap_t pmap, vaddr_t va, bool can_fail)
pmap->pm_sref++;
PMAP_DPRINTF(PDB_ENTER|PDB_PTPAGE,
("enter: about to alloc UPT pg at %lx\n", va));
simple_lock(&uvm.kernel_object->vmobjlock);
while ((pg = uvm_pagealloc(uvm.kernel_object,
simple_lock(&uvm_kernel_object->vmobjlock);
while ((pg = uvm_pagealloc(uvm_kernel_object,
va - vm_map_min(kernel_map),
NULL, UVM_PGA_ZERO)) == NULL) {
simple_unlock(&uvm.kernel_object->vmobjlock);
simple_unlock(&uvm_kernel_object->vmobjlock);
uvm_wait("ptpage");
simple_lock(&uvm.kernel_object->vmobjlock);
simple_lock(&uvm_kernel_object->vmobjlock);
}
simple_unlock(&uvm.kernel_object->vmobjlock);
simple_unlock(&uvm_kernel_object->vmobjlock);
pg->flags &= ~(PG_BUSY|PG_FAKE);
UVM_PAGE_OWN(pg, NULL);
ptpa = VM_PAGE_TO_PHYS(pg);
@ -2805,13 +2805,13 @@ pmap_ptpage_addref(vaddr_t ptpva)
{
struct vm_page *pg;
simple_lock(&uvm.kernel_object->vmobjlock);
pg = uvm_pagelookup(uvm.kernel_object, ptpva - vm_map_min(kernel_map));
simple_lock(&uvm_kernel_object->vmobjlock);
pg = uvm_pagelookup(uvm_kernel_object, ptpva - vm_map_min(kernel_map));
pg->wire_count++;
PMAP_DPRINTF(PDB_ENTER|PDB_PTPAGE|PDB_SEGTAB,
("ptpage addref: pg %p now %d\n",
pg, pg->wire_count));
simple_unlock(&uvm.kernel_object->vmobjlock);
simple_unlock(&uvm_kernel_object->vmobjlock);
}
/*
@ -2825,13 +2825,13 @@ pmap_ptpage_delref(vaddr_t ptpva)
struct vm_page *pg;
int rv;
simple_lock(&uvm.kernel_object->vmobjlock);
pg = uvm_pagelookup(uvm.kernel_object, ptpva - vm_map_min(kernel_map));
simple_lock(&uvm_kernel_object->vmobjlock);
pg = uvm_pagelookup(uvm_kernel_object, ptpva - vm_map_min(kernel_map));
rv = --pg->wire_count;
PMAP_DPRINTF(PDB_ENTER|PDB_PTPAGE|PDB_SEGTAB,
("ptpage delref: pg %p now %d\n",
pg, pg->wire_count));
simple_unlock(&uvm.kernel_object->vmobjlock);
simple_unlock(&uvm_kernel_object->vmobjlock);
return rv;
}