From owner-svn-src-user@FreeBSD.ORG Sat May 30 04:46:24 2009 Return-Path: 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 AA0D8106566C; Sat, 30 May 2009 04:46:24 +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 989AE8FC1D; Sat, 30 May 2009 04:46:24 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4U4kO0m096646; Sat, 30 May 2009 04:46:24 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4U4kOt2096645; Sat, 30 May 2009 04:46:24 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200905300446.n4U4kOt2096645@svn.freebsd.org> From: Kip Macy Date: Sat, 30 May 2009 04:46:24 +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: r193080 - user/kmacy/releng_7_2_fcs/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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 04:46:24 -0000 Author: kmacy Date: Sat May 30 04:46:24 2009 New Revision: 193080 URL: http://svn.freebsd.org/changeset/base/193080 Log: when freeing a page that was wired decrement the global wire_count Modified: user/kmacy/releng_7_2_fcs/sys/amd64/amd64/pmap.c Modified: user/kmacy/releng_7_2_fcs/sys/amd64/amd64/pmap.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/amd64/amd64/pmap.c Sat May 30 01:33:05 2009 (r193079) +++ user/kmacy/releng_7_2_fcs/sys/amd64/amd64/pmap.c Sat May 30 04:46:24 2009 (r193080) @@ -1563,7 +1563,8 @@ _pmap_allocpte(pmap_t pmap, vm_paddr_t p flags) == NULL) { KASSERT(m->wire_count == 1, ("wire_count == %d", m->wire_count)); - m->wire_count = 0; + m->wire_count = 0; + atomic_subtract_int(&cnt.v_wire_count, 1); vm_page_free(m); return (NULL); } @@ -1598,6 +1599,7 @@ _pmap_allocpte(pmap_t pmap, vm_paddr_t p 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_free(m); return (NULL); } @@ -1613,6 +1615,7 @@ _pmap_allocpte(pmap_t pmap, vm_paddr_t p 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_free(m); return (NULL); } @@ -2017,9 +2020,10 @@ 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); + mtx_unlock(&pv_lock); KASSERT(m->wire_count == 1, ("wire_count == %d", m->wire_count)); m->wire_count = 0; - mtx_unlock(&pv_lock); + atomic_subtract_int(&cnt.v_wire_count, 1); vm_page_free(m); } @@ -4007,6 +4011,7 @@ restart: ("wire_count == %d", m->wire_count)); m->wire_count = 0; mtx_unlock(&pv_lock); + atomic_subtract_int(&cnt.v_wire_count, 1); vm_page_free(m); } }