From owner-p4-projects@FreeBSD.ORG Tue Apr 18 21:00:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8471316A40F; Tue, 18 Apr 2006 21:00:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 49FBA16A40D for ; Tue, 18 Apr 2006 21:00:28 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 761DB43D5D for ; Tue, 18 Apr 2006 21:00:27 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3IL0ROK082969 for ; Tue, 18 Apr 2006 21:00:27 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3IL0RUt082963 for perforce@freebsd.org; Tue, 18 Apr 2006 21:00:27 GMT (envelope-from marcel@freebsd.org) Date: Tue, 18 Apr 2006 21:00:27 GMT Message-Id: <200604182100.k3IL0RUt082963@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 95533 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Apr 2006 21:00:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=95533 Change 95533 by marcel@marcel_nfs on 2006/04/18 21:00:21 IFC @95528 Affected files ... .. //depot/projects/uart/amd64/amd64/pmap.c#32 integrate .. //depot/projects/uart/kern/kern_rwlock.c#4 integrate Differences ... ==== //depot/projects/uart/amd64/amd64/pmap.c#32 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.545 2006/04/13 03:31:48 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.547 2006/04/18 20:17:32 peter Exp $"); /* * Manages physical address maps. @@ -1547,7 +1547,7 @@ PV_STAT(pv_entry_frees++); PV_STAT(pv_entry_spare++); - PV_STAT(pv_entry_count--); + pv_entry_count--; pc = pv_to_chunk(pv); idx = pv - &pc->pc_pventry[0]; field = idx / 64; @@ -1588,7 +1588,7 @@ PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); PV_STAT(pv_entry_allocs++); - PV_STAT(pv_entry_count++); + pv_entry_count++; if (pv_entry_count > pv_entry_high_water) pagedaemon_wakeup(); pc = TAILQ_FIRST(&pmap->pm_pvchunk); @@ -1616,6 +1616,7 @@ m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); if (m == NULL) { if (try) { + pv_entry_count--; PV_STAT(pc_chunk_tryfail++); return (NULL); } @@ -2777,7 +2778,7 @@ /* Mark free */ PV_STAT(pv_entry_frees++); PV_STAT(pv_entry_spare++); - PV_STAT(pv_entry_count--); + pv_entry_count--; pc->pc_map[field] |= bitmask; m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); ==== //depot/projects/uart/kern/kern_rwlock.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.7 2006/04/18 18:27:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.8 2006/04/18 20:32:42 wkoszek Exp $"); #include "opt_ddb.h" @@ -135,7 +135,9 @@ void _rw_rlock(struct rwlock *rw, const char *file, int line) { +#ifdef SMP volatile struct thread *owner; +#endif uintptr_t x; KASSERT(rw_wowner(rw) != curthread, @@ -388,7 +390,9 @@ void _rw_wlock_hard(struct rwlock *rw, uintptr_t tid, const char *file, int line) { +#ifdef SMP volatile struct thread *owner; +#endif uintptr_t v; if (LOCK_LOG_TEST(&rw->rw_object, 0))