Module Name: src Committed By: yamt Date: Thu Nov 10 14:32:36 UTC 2011
Modified Files: src/sys/arch/x86/x86 [yamt-pagecache]: pmap.c Log Message: remove uobj->memq To generate a diff of this commit: cvs rdiff -u -r1.137.2.2 -r1.137.2.3 src/sys/arch/x86/x86/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/x86/x86/pmap.c diff -u src/sys/arch/x86/x86/pmap.c:1.137.2.2 src/sys/arch/x86/x86/pmap.c:1.137.2.3 --- src/sys/arch/x86/x86/pmap.c:1.137.2.2 Thu Nov 10 14:31:44 2011 +++ src/sys/arch/x86/x86/pmap.c Thu Nov 10 14:32:36 2011 @@ -1,4 +1,4 @@ -/* $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. @@ -171,7 +171,7 @@ */ #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" @@ -1805,7 +1805,7 @@ pmap_freepage(struct pmap *pmap, struct 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; @@ -2366,7 +2366,6 @@ pmap_destroy(struct pmap *pmap) for (i = 0; i < PTP_LEVELS - 1; i++) { KASSERT(pmap->pm_obj[i].uo_npages == 0); - KASSERT(TAILQ_EMPTY(&pmap->pm_obj[i].memq)); } /*