From owner-svn-src-stable-7@FreeBSD.ORG  Tue Mar 30 12:08:00 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 842DB106566C;
	Tue, 30 Mar 2010 12:08:00 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7264D8FC17;
	Tue, 30 Mar 2010 12:08:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2UC80eC074019;
	Tue, 30 Mar 2010 12:08:00 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2UC80hI074017;
	Tue, 30 Mar 2010 12:08:00 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201003301208.o2UC80hI074017@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Tue, 30 Mar 2010 12:08:00 +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: r205879 - stable/7/sys/dev/aac
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Mar 2010 12:08:00 -0000

Author: attilio
Date: Tue Mar 30 12:08:00 2010
New Revision: 205879
URL: http://svn.freebsd.org/changeset/base/205879

Log:
  MFC r205167:
  Make the code more readable and compiling on 64-bits arch different
  than amd64.
  
  Sponsored by:	Sandvine Incorporated

Modified:
  stable/7/sys/dev/aac/aac.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/aac/aac.c
==============================================================================
--- stable/7/sys/dev/aac/aac.c	Tue Mar 30 12:06:18 2010	(r205878)
+++ stable/7/sys/dev/aac/aac.c	Tue Mar 30 12:08:00 2010	(r205879)
@@ -3127,11 +3127,7 @@ aac_ioctl_send_raw_srb(struct aac_softc 
 		sge = srbcmd->sg_map.SgEntry;
 		sge64 = NULL;
 		srb_sg_bytecount = sge->SgByteCount;
-#ifdef __amd64__
-		srb_sg_address = (void *)(uint64_t)sge->SgAddress;
-#else
-		srb_sg_address = (void *)sge->SgAddress;
-#endif
+		srb_sg_address = (void *)(uintptr_t)sge->SgAddress;
 	}
 #ifdef __amd64__
 	else if (fibsize == (sizeof(struct aac_srb) +