From owner-svn-src-all@FreeBSD.ORG  Sun Mar 15 17:25:44 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E993010656BB;
	Sun, 15 Mar 2009 17:25:44 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D5E418FC22;
	Sun, 15 Mar 2009 17:25:44 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2FHPi4q035209;
	Sun, 15 Mar 2009 17:25:44 GMT (envelope-from rnoland@svn.freebsd.org)
Received: (from rnoland@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2FHPiYn035208;
	Sun, 15 Mar 2009 17:25:44 GMT (envelope-from rnoland@svn.freebsd.org)
Message-Id: <200903151725.n2FHPiYn035208@svn.freebsd.org>
From: Robert Noland <rnoland@FreeBSD.org>
Date: Sun, 15 Mar 2009 17:25:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189859 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb dev/drm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Mar 2009 17:25:46 -0000

Author: rnoland
Date: Sun Mar 15 17:25:44 2009
New Revision: 189859
URL: http://svn.freebsd.org/changeset/base/189859

Log:
  Merge r189562
  
  Clean up the printing on amd64.  Should also be consistent on i386.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/drm/drm_sysctl.c

Modified: stable/7/sys/dev/drm/drm_sysctl.c
==============================================================================
--- stable/7/sys/dev/drm/drm_sysctl.c	Sun Mar 15 17:24:48 2009	(r189858)
+++ stable/7/sys/dev/drm/drm_sysctl.c	Sun Mar 15 17:25:44 2009	(r189859)
@@ -185,8 +185,8 @@ static int drm_vm_info DRM_SYSCTL_HANDLE
 
 	DRM_UNLOCK();
 
-	DRM_SYSCTL_PRINT("\nslot	 offset	      size type flags	 "
-			 "address mtrr\n");
+	DRM_SYSCTL_PRINT("\nslot offset	        size       "
+	    "type flags address            mtrr\n");
 
 	for (i = 0; i < mapcount; i++) {
 		map = &tempmaps[i];
@@ -202,7 +202,7 @@ static int drm_vm_info DRM_SYSCTL_HANDLE
 			yesno = "yes";
 
 		DRM_SYSCTL_PRINT(
-		    "%4d 0x%08lx 0x%08lx %4.4s  0x%02x 0x%08lx %s\n", i,
+		    "%4d 0x%016lx 0x%08lx %4.4s  0x%02x 0x%016lx %s\n", i,
 		    map->offset, map->size, type, map->flags,
 		    (unsigned long)map->handle, yesno);
 	}