Thu Nov 10 14:32:36 2011 UTC ()

remove uobj->memq


(yamt)

diff -r1.137.2.2 -r1.137.2.3 src/sys/arch/x86/x86/pmap.c

--- src/sys/arch/x86/x86/pmap.c 2011/11/10 14:31:44	1.137.2.2
+++ src/sys/arch/x86/x86/pmap.c 2011/11/10 14:32:36	1.137.2.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.137.2.2 2011/11/10 14:31:44 yamt Exp $	*/
+/*	$NetBSD: pmap.c,v 1.137.2.3 2011/11/10 14:32:36 yamt Exp $	*/
 /*-
  * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -161,27 +161,27 @@
  *     Hibler/Jolitz pmap, as modified for FreeBSD by John S. Dyson
  *     and David Greenman.
+ *
  * [3] the Mach pmap.   this pmap, from CMU, seems to have migrated
  *     between several processors.   the VAX version was done by
  *     Avadis Tevanian, Jr., and Michael Wayne Young.    the i386
  *     version was done by Lance Berc, Mike Kupfer, Bob Baron,
  *     David Golub, and Richard Draves.    the alpha version was
  *     done by Alessandro Forin (CMU/Mach) and Chris Demetriou
  *     (NetBSD/alpha).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.137.2.2 2011/11/10 14:31:44 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.137.2.3 2011/11/10 14:32:36 yamt Exp $");
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
 #if !defined(__x86_64__)
 #include "opt_kstack_dr0.h"
 #endif /* !defined(__x86_64__) */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/pool.h>
 @@ -1795,27 +1795,27 @@ pmap_freepage(struct pmap *pmap, struct
 	lwp_t *l;
 	int lidx;
 	struct uvm_object *obj;
 	KASSERT(ptp->wire_count == 1);
 	lidx = level - 1;
 	obj = &pmap->pm_obj[lidx];
 	pmap_stats_update(pmap, -1, 0);
 	if (lidx != 0)
 		mutex_enter(obj->vmobjlock);
 	if (pmap->pm_ptphint[lidx] == ptp)
-		pmap->pm_ptphint[lidx] = TAILQ_FIRST(&obj->memq);
+		pmap->pm_ptphint[lidx] = NULL;
 	ptp->wire_count = 0;
 	uvm_pagerealloc(ptp, NULL, 0);
 	l = curlwp;
 	KASSERT((l->l_pflag & LP_INTR) == 0);
 	VM_PAGE_TO_PP(ptp)->pp_link = l->l_md.md_gc_ptp;
 	l->l_md.md_gc_ptp = ptp;
 	if (lidx != 0)
 		mutex_exit(obj->vmobjlock);
+}
 static void
 pmap_free_ptp(struct pmap *pmap, struct vm_page *ptp, vaddr_t va,
 	      pt_entry_t *ptes, pd_entry_t * const *pdes)
 @@ -2356,27 +2356,26 @@ pmap_destroy(struct pmap *pmap)
 	/*
 	 * Process deferred PTP frees.  No TLB shootdown required, as the
 	 * PTP pages are no longer visible to any CPU.
 	 */
 	pmap_free_ptps(pmap->pm_gc_ptp);
 	/*
 	 * destroyed pmap shouldn't have remaining PTPs
 	 */
 	for (i = 0; i < PTP_LEVELS - 1; i++) {
 		KASSERT(pmap->pm_obj[i].uo_npages == 0);
 		KASSERT(TAILQ_EMPTY(&pmap->pm_obj[i].memq));
+	}
 	/*
 	 * MULTIPROCESSOR -- no need to flush out of other processors'
 	 * APTE space because we do that in pmap_unmap_ptes().
 	 */
 	pool_cache_put(&pmap_pdp_cache, pmap->pm_pdir);
 #ifdef USER_LDT
 	if (pmap->pm_ldt != NULL) {
 		/*
 		 * no need to switch the LDT; this address space is gone,
 		 * nothing is using it.