svn commit: r188933 - in user/alc/pagelock/sys: . amd64/amd64 i386/i386

[Alan Cox]

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);