From owner-svn-src-user@FreeBSD.ORG Mon Feb 23 06:47:10 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 DF9E7106564A; Mon, 23 Feb 2009 06:47:10 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B3A5D8FC13; Mon, 23 Feb 2009 06:47:10 +0000 (UTC) (envelope-from alc@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 n1N6lA3k017109; Mon, 23 Feb 2009 06:47:10 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1N6lAqD017107; Mon, 23 Feb 2009 06:47:10 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <200902230647.n1N6lAqD017107@svn.freebsd.org> From: Alan Cox Date: Mon, 23 Feb 2009 06:47: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: r188933 - in user/alc/pagelock/sys: . amd64/amd64 i386/i386 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: Mon, 23 Feb 2009 06:47:11 -0000 Author: alc Date: Mon Feb 23 06:47:10 2009 New Revision: 188933 URL: http://svn.freebsd.org/changeset/base/188933 Log: Merge r188930 through r188932. Modified: user/alc/pagelock/sys/ (props changed) user/alc/pagelock/sys/amd64/amd64/pmap.c user/alc/pagelock/sys/i386/i386/pmap.c Modified: user/alc/pagelock/sys/amd64/amd64/pmap.c ============================================================================== --- user/alc/pagelock/sys/amd64/amd64/pmap.c Mon Feb 23 06:00:24 2009 (r188932) +++ user/alc/pagelock/sys/amd64/amd64/pmap.c Mon Feb 23 06:47:10 2009 (r188933) @@ -1936,15 +1936,15 @@ free_pv_entry(pmap_t pmap, pv_entry_t pv pc->pc_map[field] |= 1ul << bit; /* move to head of list */ TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); - TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); if (pc->pc_map[0] != PC_FREE0 || pc->pc_map[1] != PC_FREE1 || - pc->pc_map[2] != PC_FREE2) + pc->pc_map[2] != PC_FREE2) { + TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); return; + } PV_STAT(pv_entry_spare -= _NPCPV); PV_STAT(pc_chunk_count--); PV_STAT(pc_chunk_frees++); /* entire chunk is free, return it */ - 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); m->wire_count--; Modified: user/alc/pagelock/sys/i386/i386/pmap.c ============================================================================== --- user/alc/pagelock/sys/i386/i386/pmap.c Mon Feb 23 06:00:24 2009 (r188932) +++ user/alc/pagelock/sys/i386/i386/pmap.c Mon Feb 23 06:47:10 2009 (r188933) @@ -1975,15 +1975,15 @@ free_pv_entry(pmap_t pmap, pv_entry_t pv pc->pc_map[field] |= 1ul << bit; /* move to head of list */ TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); - TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); for (idx = 0; idx < _NPCM; idx++) - if (pc->pc_map[idx] != pc_freemask[idx]) + if (pc->pc_map[idx] != pc_freemask[idx]) { + TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); return; + } PV_STAT(pv_entry_spare -= _NPCPV); PV_STAT(pc_chunk_count--); PV_STAT(pc_chunk_frees++); /* entire chunk is free, return it */ - TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); m = PHYS_TO_VM_PAGE(pmap_kextract((vm_offset_t)pc)); pmap_qremove((vm_offset_t)pc, 1); vm_page_unwire(m, 0);