From owner-svn-src-all@FreeBSD.ORG  Tue Oct  2 23:04:13 2012
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 F0CCE106566C;
	Tue,  2 Oct 2012 23:04:12 +0000 (UTC) (envelope-from ken@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DC64E8FC0A;
	Tue,  2 Oct 2012 23:04:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q92N4C1u019484;
	Tue, 2 Oct 2012 23:04:12 GMT (envelope-from ken@svn.freebsd.org)
Received: (from ken@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q92N4CHB019481;
	Tue, 2 Oct 2012 23:04:12 GMT (envelope-from ken@svn.freebsd.org)
Message-Id: <201210022304.q92N4CHB019481@svn.freebsd.org>
From: "Kenneth D. Merry" <ken@FreeBSD.org>
Date: Tue, 2 Oct 2012 23:04:12 +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: r241145 - head/sys/dev/mps
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: Tue, 02 Oct 2012 23:04:13 -0000

Author: ken
Date: Tue Oct  2 23:04:12 2012
New Revision: 241145
URL: http://svn.freebsd.org/changeset/base/241145

Log:
  Add casts to unbreak the i386 PAE build for the mps(4) driver.
  
  MFC after:	3 days
  Prompted by:	Garrett Cooper

Modified:
  head/sys/dev/mps/mps_sas.c

Modified: head/sys/dev/mps/mps_sas.c
==============================================================================
--- head/sys/dev/mps/mps_sas.c	Tue Oct  2 22:03:21 2012	(r241144)
+++ head/sys/dev/mps/mps_sas.c	Tue Oct  2 23:04:12 2012	(r241145)
@@ -2730,7 +2730,7 @@ mpssas_send_smpcmd(struct mpssas_softc *
 			bus_dma_segment_t *req_sg;
 
 			req_sg = (bus_dma_segment_t *)ccb->smpio.smp_request;
-			request = (uint8_t *)req_sg[0].ds_addr;
+			request = (uint8_t *)(uintptr_t)req_sg[0].ds_addr;
 		} else
 			request = ccb->smpio.smp_request;
 
@@ -2738,7 +2738,7 @@ mpssas_send_smpcmd(struct mpssas_softc *
 			bus_dma_segment_t *rsp_sg;
 
 			rsp_sg = (bus_dma_segment_t *)ccb->smpio.smp_response;
-			response = (uint8_t *)rsp_sg[0].ds_addr;
+			response = (uint8_t *)(uintptr_t)rsp_sg[0].ds_addr;
 		} else
 			response = ccb->smpio.smp_response;
 	} else {