diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-31 13:40:29 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-31 13:40:29 -0700 |
commit | 57eb06e584be3b702d1ba5c39e0b57ddcdabdc66 (patch) | |
tree | 2b438f438748ff0c9dec86ee44cfb615f7ccee46 /drivers/scsi/arm | |
parent | 2ed45b07c957e37db88d7d3696b63eb79b0ef5ef (diff) | |
parent | 558de8a74efe37a4b5e2ef944da17d23e701dd98 (diff) | |
download | linux-57eb06e584be3b702d1ba5c39e0b57ddcdabdc66.tar.gz linux-57eb06e584be3b702d1ba5c39e0b57ddcdabdc66.tar.bz2 linux-57eb06e584be3b702d1ba5c39e0b57ddcdabdc66.zip |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4634/1: DaVinci GPIO header build fix
[ARM] 4636/1: pxa: add default configuration for zylonite
[ARM] 4635/1: pxa: Change Eric Miao's email address to eric.miao@marvell.com
[ARM] Fix assignment instead of condition in arm/mach-omap2/clock.c
[ARM] nommu: fix breakage caused by f9720205d1f847cb59e197e851b5276425363f6b
[ARM] pxa: shut up CLOCK_EVT_MODE_RESUME warning
[ARM] Fix FIQ issue with ARM926
[ARM] Fix pxamci regression
[ARM] Fix netx_defconfig regression
[ARM] Fix ateb9200_defconfig build regression
[ARM] Fix an rpc_defconfig regression
[ARM] Fix omap_h2_1610_defconfig regressions
[ARM] 4632/1: Fix a typo in include/asm-arm/plat-s3c/regs-nand.h
Diffstat (limited to 'drivers/scsi/arm')
-rw-r--r-- | drivers/scsi/arm/scsi.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/scsi/arm/scsi.h b/drivers/scsi/arm/scsi.h index 21ba57155bea..bb6550e31926 100644 --- a/drivers/scsi/arm/scsi.h +++ b/drivers/scsi/arm/scsi.h @@ -38,9 +38,7 @@ static inline int next_SCp(struct scsi_pointer *SCp) if (ret) { SCp->buffer++; SCp->buffers_residual--; - SCp->ptr = (char *) - (page_address(SCp->buffer->page) + - SCp->buffer->offset); + SCp->ptr = sg_virt(SCp->buffer); SCp->this_residual = SCp->buffer->length; } else { SCp->ptr = NULL; @@ -76,9 +74,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) + - SCpnt->SCp.buffer->offset); + SCpnt->SCp.ptr = sg_virt(SCpnt->SCp.buffer); SCpnt->SCp.this_residual = SCpnt->SCp.buffer->length; SCpnt->SCp.phase = SCpnt->request_bufflen; |