svn commit: r205878 - stable/8/sys/dev/aac

[Attilio Rao]

Author: attilio
Date: Tue Mar 30 12:06:18 2010
New Revision: 205878
URL: http://svn.freebsd.org/changeset/base/205878

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

Modified:
  stable/8/sys/dev/aac/aac.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/aac/aac.c
==============================================================================
--- stable/8/sys/dev/aac/aac.c	Tue Mar 30 12:01:35 2010	(r205877)
+++ stable/8/sys/dev/aac/aac.c	Tue Mar 30 12:06:18 2010	(r205878)
@@ -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) +