[PATCH] scatterlist fallout: drivers/scsi/arm/

Al Viro
2007-10-27T18:44:19Z

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
diff --git a/drivers/scsi/arm/scsi.h b/drivers/scsi/arm/scsi.h
index 21ba571..2d09fef 100644
--- a/drivers/scsi/arm/scsi.h
+++ b/drivers/scsi/arm/scsi.h
@@ -39,7 +39,7 @@ static inline int next_SCp(struct scsi_pointer *SCp)
SCp->buffer++;
SCp->buffers_residual--;
SCp->ptr = (char *)
- (page_address(SCp->buffer->page) +
+ (page_address(sg_page(SCp->buffer)) +
SCp->buffer->offset);
SCp->this_residual = SCp->buffer->length;
} else {
@@ -77,7 +77,7 @@ static inline void init_SCp(struct scsi_cmnd *SCpnt)
SCpnt->SCp.buffer = (struct scatterlist *) SCpnt->request_buffer;
SCpnt->SCp.buffers_residual = SCpnt->use_sg - 1;
SCpnt->SCp.ptr = (char *)
- (page_address(SCpnt->SCp.buffer->page) +
+ (page_address(sg_page(SCpnt->SCp.buffer)) +
SCpnt->SCp.buffer->offset);
SCpnt->SCp.this_residual = SCpnt->SCp.buffer->length;
SCpnt->SCp.phase = SCpnt->request_bufflen;