From owner-p4-projects@FreeBSD.ORG  Wed Nov 10 23:25:37 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C683316A4FE; Wed, 10 Nov 2004 23:25:15 +0000 (GMT)
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 85F0916A4DD
	for <perforce@freebsd.org>; Wed, 10 Nov 2004 23:25:15 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 63BEA43D45
	for <perforce@freebsd.org>; Wed, 10 Nov 2004 23:25:15 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAANPFaV056743
	for <perforce@freebsd.org>; Wed, 10 Nov 2004 23:25:15 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAANPFF7056740
	for perforce@freebsd.org; Wed, 10 Nov 2004 23:25:15 GMT
	(envelope-from peter@freebsd.org)
Date: Wed, 10 Nov 2004 23:25:15 GMT
Message-Id: <200411102325.iAANPFF7056740@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 64849 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Wed, 10 Nov 2004 23:25:37 -0000

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

Change 64849 by peter@peter_daintree on 2004/11/10 23:24:15

	fix mismerge

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#51 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#51 (text+ko) ====

@@ -427,7 +427,7 @@
  * returned.
  */
 struct sf_buf *
-sf_buf_alloc(struct vm_page *m, int flags)
+sf_buf_alloc(struct vm_page *m, int pri)
 {
 
 	return ((struct sf_buf *)m);