From owner-svn-src-head@FreeBSD.ORG  Mon Mar 15 14:20:17 2010
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 65B061065670;
	Mon, 15 Mar 2010 14:20:17 +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 5491D8FC0A;
	Mon, 15 Mar 2010 14:20:17 +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 o2FEKH9d085711;
	Mon, 15 Mar 2010 14:20:17 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2FEKHgT085710;
	Mon, 15 Mar 2010 14:20:17 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201003151420.o2FEKHgT085710@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Mon, 15 Mar 2010 14:20:17 +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: r205167 - head/sys/dev/aac
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: Mon, 15 Mar 2010 14:20:17 -0000

Author: attilio
Date: Mon Mar 15 14:20:16 2010
New Revision: 205167
URL: http://svn.freebsd.org/changeset/base/205167

Log:
  Make the code more readable and compiling on 64-bits arch different
  than amd64.
  
  Sponsored by:	Sandvine Incorporated
  Submitted by:	emaste
  MFC:		2 weeks
  X-MFC:		r205160

Modified:
  head/sys/dev/aac/aac.c

Modified: head/sys/dev/aac/aac.c
==============================================================================
--- head/sys/dev/aac/aac.c	Mon Mar 15 09:40:23 2010	(r205166)
+++ head/sys/dev/aac/aac.c	Mon Mar 15 14:20:16 2010	(r205167)
@@ -3123,11 +3123,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) +