svn commit: r241495 - head/sys/dev/virtio/scsi

[Alexander Motin]

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);