From owner-svn-src-head@FreeBSD.ORG  Tue Dec  2 10:10:51 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0D337106567A;
	Tue,  2 Dec 2008 10:10:51 +0000 (UTC)
	(envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 01C5A8FC25;
	Tue,  2 Dec 2008 10:10:51 +0000 (UTC)
	(envelope-from peter@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 mB2AAoaW055811;
	Tue, 2 Dec 2008 10:10:50 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mB2AAowJ055809;
	Tue, 2 Dec 2008 10:10:50 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <200812021010.mB2AAowJ055809@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Tue, 2 Dec 2008 10:10:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185553 - head/lib/libutil
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Dec 2008 10:10:51 -0000

Author: peter
Date: Tue Dec  2 10:10:50 2008
New Revision: 185553
URL: http://svn.freebsd.org/changeset/base/185553

Log:
  Attempt a quick bandaid for arm build breakage.  I went to the trouble of
  maintaining alignment, but I'm not sure how to tell gcc this.

Modified:
  head/lib/libutil/kinfo_getfile.c
  head/lib/libutil/kinfo_getvmmap.c

Modified: head/lib/libutil/kinfo_getfile.c
==============================================================================
--- head/lib/libutil/kinfo_getfile.c	Tue Dec  2 08:23:45 2008	(r185552)
+++ head/lib/libutil/kinfo_getfile.c	Tue Dec  2 10:10:50 2008	(r185553)
@@ -42,7 +42,7 @@ kinfo_getfile(pid_t pid, int *cntp)
 	bp = buf;
 	eb = buf + len;
 	while (bp < eb) {
-		kf = (struct kinfo_file *)bp;
+		kf = (struct kinfo_file *)(uintptr_t)bp;
 		bp += kf->kf_structsize;
 		cnt++;
 	}
@@ -57,7 +57,7 @@ kinfo_getfile(pid_t pid, int *cntp)
 	kp = kif;
 	/* Pass 2: unpack */
 	while (bp < eb) {
-		kf = (struct kinfo_file *)bp;
+		kf = (struct kinfo_file *)(uintptr_t)bp;
 		/* Copy/expand into pre-zeroed buffer */
 		memcpy(kp, kf, kf->kf_structsize);
 		/* Advance to next packed record */

Modified: head/lib/libutil/kinfo_getvmmap.c
==============================================================================
--- head/lib/libutil/kinfo_getvmmap.c	Tue Dec  2 08:23:45 2008	(r185552)
+++ head/lib/libutil/kinfo_getvmmap.c	Tue Dec  2 10:10:50 2008	(r185553)
@@ -42,7 +42,7 @@ kinfo_getvmmap(pid_t pid, int *cntp)
 	bp = buf;
 	eb = buf + len;
 	while (bp < eb) {
-		kv = (struct kinfo_vmentry *)bp;
+		kv = (struct kinfo_vmentry *)(uintptr_t)bp;
 		bp += kv->kve_structsize;
 		cnt++;
 	}
@@ -57,7 +57,7 @@ kinfo_getvmmap(pid_t pid, int *cntp)
 	kp = kiv;
 	/* Pass 2: unpack */
 	while (bp < eb) {
-		kv = (struct kinfo_vmentry *)bp;
+		kv = (struct kinfo_vmentry *)(uintptr_t)bp;
 		/* Copy/expand into pre-zeroed buffer */
 		memcpy(kp, kv, kv->kve_structsize);
 		/* Advance to next packed record */