From owner-p4-projects@FreeBSD.ORG  Fri Aug  4 22:12:24 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B562016A4E1; Fri,  4 Aug 2006 22:12:24 +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 7933516A4DA
	for <perforce@freebsd.org>; Fri,  4 Aug 2006 22:12:24 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2610143D46
	for <perforce@freebsd.org>; Fri,  4 Aug 2006 22:12:24 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74MCO8b058836
	for <perforce@freebsd.org>; Fri, 4 Aug 2006 22:12:24 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74MCOd4058833
	for perforce@freebsd.org; Fri, 4 Aug 2006 22:12:24 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 4 Aug 2006 22:12:24 GMT
Message-Id: <200608042212.k74MCOd4058833@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 103203 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Aug 2006 22:12:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=103203

Change 103203 by jb@jb_freebsd2 on 2006/08/04 22:12:21

	Fix an integration error which happened when bike_sched was integrated
	in sun4v_stable, but then was integrated into the dtrace tree. Oops.

Affected files ...

.. //depot/projects/dtrace/src/sys/vm/vm_pageq.c#5 edit

Differences ...

==== //depot/projects/dtrace/src/sys/vm/vm_pageq.c#5 (text+ko) ====

@@ -199,7 +199,6 @@
 	m->flags = 0;
 	m->pc = (pa >> PAGE_SHIFT) & PQ_COLORMASK;
 	pmap_page_init(m);
-	mtx_lock_spin(&vm_page_queue_free_mtx);
 	if (!smp_started) {
 		vm_pageq_enqueue(m->pc + PQ_FREE, m);
 	} else {
@@ -207,7 +206,6 @@
 		vm_pageq_enqueue(m->pc + PQ_FREE, m);
 		mtx_unlock_spin(&vm_page_queue_free_mtx);
 	}
-	mtx_unlock_spin(&vm_page_queue_free_mtx);
 	return (m);
 }