From owner-svn-src-all@FreeBSD.ORG  Fri Oct 12 22:06:07 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 131FDADC;
 Fri, 12 Oct 2012 22:06:07 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id EF5398FC14;
 Fri, 12 Oct 2012 22:06:06 +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 q9CM66f0084297;
 Fri, 12 Oct 2012 22:06:06 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9CM66aM084295;
 Fri, 12 Oct 2012 22:06:06 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201210122206.q9CM66aM084295@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 12 Oct 2012 22:06:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241495 - head/sys/dev/virtio/scsi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Fri, 12 Oct 2012 22:06:07 -0000

Author: mav
Date: Fri Oct 12 22:06:06 2012
New Revision: 241495
URL: http://svn.freebsd.org/changeset/base/241495

Log:
  Fix build with PAE enabled.  I doubt any code uses CAM_SCATTER_VALID or
  CAM_DATA_PHYS, or they ever correctly worked, but make this build at least.

Modified:
  head/sys/dev/virtio/scsi/virtio_scsi.c

Modified: head/sys/dev/virtio/scsi/virtio_scsi.c
==============================================================================
--- head/sys/dev/virtio/scsi/virtio_scsi.c	Fri Oct 12 21:58:21 2012	(r241494)
+++ head/sys/dev/virtio/scsi/virtio_scsi.c	Fri Oct 12 22:06:06 2012	(r241495)
@@ -971,7 +971,8 @@ vtscsi_sg_append_scsi_buf(struct vtscsi_
 			    csio->data_ptr, csio->dxfer_len);
 		else
 			error = sglist_append_phys(sg,
-			    (vm_paddr_t) csio->data_ptr, csio->dxfer_len);
+			    (vm_paddr_t)(vm_offset_t) csio->data_ptr,
+			    csio->dxfer_len);
 	} else {
 
 		for (i = 0; i < csio->sglist_cnt && error == 0; i++) {
@@ -979,7 +980,8 @@ vtscsi_sg_append_scsi_buf(struct vtscsi_
 
 			if ((ccbh->flags & CAM_SG_LIST_PHYS) == 0)
 				error = sglist_append(sg,
-				    (void *) dseg->ds_addr, dseg->ds_len);
+				    (void *)(vm_offset_t) dseg->ds_addr,
+				    dseg->ds_len);
 			else
 				error = sglist_append_phys(sg,
 				    (vm_paddr_t) dseg->ds_addr, dseg->ds_len);