From owner-p4-projects@FreeBSD.ORG  Sat Feb 19 21:42:19 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C5E2216A4D0; Sat, 19 Feb 2005 21:42:18 +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 8584516A4CE
	for <perforce@freebsd.org>; Sat, 19 Feb 2005 21:42:18 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6A8DE43D46
	for <perforce@freebsd.org>; Sat, 19 Feb 2005 21:42:18 +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 j1JLgIiO065190
	for <perforce@freebsd.org>; Sat, 19 Feb 2005 21:42:18 GMT
	(envelope-from anholt@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1JLgIE1065187
	for perforce@freebsd.org; Sat, 19 Feb 2005 21:42:18 GMT
	(envelope-from anholt@freebsd.org)
Date: Sat, 19 Feb 2005 21:42:18 GMT
Message-Id: <200502192142.j1JLgIE1065187@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 71344 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: Sat, 19 Feb 2005 21:42:19 -0000

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

Change 71344 by anholt@anholt_leguin on 2005/02/19 21:42:16

	Warnings fixes to get the build going.  Needs to be merged upstream.	

Affected files ...

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

Differences ...

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

@@ -497,7 +497,8 @@
 		    (i >= ring->head - MACH64_DUMP_CONTEXT * 4 &&
 		     i <= ring->head + MACH64_DUMP_CONTEXT * 4)) {
 			DRM_INFO("  0x%08x:  0x%08x 0x%08x 0x%08x 0x%08x%s%s\n",
-				 ring->start_addr + i * sizeof(u32),
+				 (unsigned int)(ring->start_addr +
+				 i * sizeof(u32)),
 				 le32_to_cpu(((u32 *) ring->start)[i + 0]),
 				 le32_to_cpu(((u32 *) ring->start)[i + 1]),
 				 le32_to_cpu(((u32 *) ring->start)[i + 2]),
@@ -913,8 +914,8 @@
 	}
 
 	memset(dev_priv->ring.start, 0, dev_priv->ring.size);
-	DRM_INFO("descriptor ring: cpu addr 0x%08x, bus addr: 0x%08x\n",
-		 (u32) dev_priv->ring.start, dev_priv->ring.start_addr);
+	DRM_INFO("descriptor ring: cpu addr %p, bus addr: 0x%08x\n",
+		 dev_priv->ring.start, dev_priv->ring.start_addr);
 
 	ret = 0;
 	if (dev_priv->driver_mode != MACH64_MODE_MMIO) {