From owner-svn-src-user@FreeBSD.ORG Mon Apr 26 01:13:11 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 1A169106566C;
Mon, 26 Apr 2010 01:13:11 +0000 (UTC)
(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 0A57E8FC14;
Mon, 26 Apr 2010 01:13:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3Q1DAaj025940;
Mon, 26 Apr 2010 01:13:10 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3Q1DAUd025938;
Mon, 26 Apr 2010 01:13:10 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201004260113.o3Q1DAUd025938@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 26 Apr 2010 01:13:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r207215 - user/kmacy/head_page_lock_2/sys/amd64/amd64
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Apr 2010 01:13:11 -0000
Author: kmacy
Date: Mon Apr 26 01:13:10 2010
New Revision: 207215
URL: http://svn.freebsd.org/changeset/base/207215
Log:
- white space cleanup
- use vm_page_unwire in the same places that it is used on HEAD
Modified:
user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c
Modified: user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c
==============================================================================
--- user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c Mon Apr 26 01:12:13 2010 (r207214)
+++ user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c Mon Apr 26 01:13:10 2010 (r207215)
@@ -2146,9 +2146,7 @@ free_pv_entry(pmap_t pmap, pv_entry_t pv
/* entire chunk is free, return it */
m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc));
dump_drop_page(m->phys_addr);
- KASSERT(m->wire_count == 1, ("wire_count == %d", m->wire_count));
- m->wire_count--;
- atomic_subtract_int(&cnt.v_wire_count, 1);
+ vm_page_unwire(m, 0);
vm_page_free(m);
}
@@ -3339,15 +3337,14 @@ pmap_enter(pmap_t pmap, vm_offset_t va,
vm_paddr_t pa;
pd_entry_t *pde;
pt_entry_t *pte;
- vm_paddr_t opa, lockedpa;
pt_entry_t origpte, newpte;
vm_page_t mpte, om;
boolean_t invlva, opalocked;
+ vm_paddr_t lockedpa, opa = 0;
pv_entry_t pv;
struct lock_stack ls;
va = trunc_page(va);
-
KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig"));
KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS,
("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", va));
@@ -3355,7 +3352,6 @@ pmap_enter(pmap_t pmap, vm_offset_t va,
mpte = NULL;
pv = NULL;
lockedpa = pa = VM_PAGE_TO_PHYS(m);
- opa = 0;
opalocked = FALSE;
ls_init(&ls);
ls_push(&ls, &lock_class_mtx_sleep,
@@ -4413,10 +4409,7 @@ restart:
TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list);
m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc));
dump_drop_page(m->phys_addr);
- KASSERT(m->wire_count == 1,
- ("wire_count == %d", m->wire_count));
- m->wire_count = 0;
- atomic_subtract_int(&cnt.v_wire_count, 1);
+ vm_page_unwire(m, 0);
vm_page_free(m);
}
}