From owner-p4-projects@FreeBSD.ORG  Wed Apr 13 05:21:13 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 80E2D16A4D0; Wed, 13 Apr 2005 05:21:13 +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 5C45816A4CE
	for <perforce@freebsd.org>; Wed, 13 Apr 2005 05:21:13 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 463E943D3F
	for <perforce@freebsd.org>; Wed, 13 Apr 2005 05:21:13 +0000 (GMT)
	(envelope-from anholt@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 j3D5LDVk016961
	for <perforce@freebsd.org>; Wed, 13 Apr 2005 05:21:13 GMT
	(envelope-from anholt@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3D5LDZJ016958
	for perforce@freebsd.org; Wed, 13 Apr 2005 05:21:13 GMT
	(envelope-from anholt@freebsd.org)
Date: Wed, 13 Apr 2005 05:21:13 GMT
Message-Id: <200504130521.j3D5LDZJ016958@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anholt@freebsd.org using -f
From: Eric Anholt <anholt@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 75048 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, 13 Apr 2005 05:21:14 -0000

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

Change 75048 by anholt@anholt_leguin on 2005/04/13 05:20:54

	Fix compile for -current.

Affected files ...

.. //depot/projects/drm-merge/sys/dev/drm/drm_bufs.c#3 edit

Differences ...

==== //depot/projects/drm-merge/sys/dev/drm/drm_bufs.c#3 (text+ko) ====

@@ -979,8 +979,13 @@
 
 #ifdef __FreeBSD__
 	vaddr = round_page((vm_offset_t)vms->vm_daddr + MAXDSIZ);
+#if __FreeBSD_version >= 600023
 	retcode = vm_mmap(&vms->vm_map, &vaddr, size, PROT_READ | PROT_WRITE,
+	    VM_PROT_ALL, MAP_SHARED, OBJT_DEVICE, kdev, foff );
+#else
+	retcode = vm_mmap(&vms->vm_map, &vaddr, size, PROT_READ | PROT_WRITE,
 	    VM_PROT_ALL, MAP_SHARED, SLIST_FIRST(&kdev->si_hlist), foff );
+#endif
 #elif defined(__NetBSD__) || defined(__OpenBSD__)
 	vaddr = round_page((vaddr_t)vms->vm_daddr + MAXDSIZ);
 	retcode = uvm_mmap(&vms->vm_map, &vaddr, size,