diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-25 18:44:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-25 18:44:54 -0400 |
| commit | 7f1495745347bc2cb9cc4f50d0a889caeb71f1f1 (patch) | |
| tree | 2402b7e52fec57cdbf16d52e5fb467044589ec31 /drivers/s390/scsi/zfcp_def.h | |
| parent | 2c7505570353af02e48c58ab4d109edd9bbbdd81 (diff) | |
| parent | 85cdffcde0b6b831a06422413300d0f5c0e608c3 (diff) | |
Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block
* 'sg' of git://git.kernel.dk/linux-2.6-block:
fix sg_phys to use dma_addr_t
ub: add sg_init_table for sense and read capacity commands
x86: pci-gart fix
blackfin: fix sg fallout
xtensa: dma-mapping.h is using linux/scatterlist.h functions, so include it
SG: audit of drivers that use blk_rq_map_sg()
arch/um/drivers/ubd_kern.c: fix a building error
SG: Change sg_set_page() to take length and offset argument
AVR32: Fix sg_page breakage
mmc: sg fallout
m68k: sg fallout
More SG build fixes
sg: add missing sg_init_table calls to zfcp
SG build fix
Diffstat (limited to 'drivers/s390/scsi/zfcp_def.h')
| -rw-r--r-- | drivers/s390/scsi/zfcp_def.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h index 326e7ee232cb..0754542978b6 100644 --- a/drivers/s390/scsi/zfcp_def.h +++ b/drivers/s390/scsi/zfcp_def.h | |||
| @@ -74,8 +74,7 @@ zfcp_sg_to_address(struct scatterlist *list) | |||
| 74 | static inline void | 74 | static inline void |
| 75 | zfcp_address_to_sg(void *address, struct scatterlist *list) | 75 | zfcp_address_to_sg(void *address, struct scatterlist *list) |
| 76 | { | 76 | { |
| 77 | sg_set_page(list, virt_to_page(address)); | 77 | sg_set_buf(list, address, 0); |
| 78 | list->offset = ((unsigned long) address) & (PAGE_SIZE - 1); | ||
| 79 | } | 78 | } |
| 80 | 79 | ||
| 81 | #define REQUEST_LIST_SIZE 128 | 80 | #define REQUEST_LIST_SIZE 128 |