diff options
| author | davem <davem> | 2002-02-10 06:18:48 +0000 |
|---|---|---|
| committer | davem <davem> | 2002-02-10 06:18:48 +0000 |
| commit | cb17b3843db30da90ddd2571f7d796be51980e74 (patch) | |
| tree | 7f36abb31a225badab3d14dc3341f18ac7ba494a | |
| parent | b71e339e1cbfee6d77bdc99a426113b489b4fbba (diff) | |
| download | netdev-vger-cvs-cb17b3843db30da90ddd2571f7d796be51980e74.tar.gz | |
Merge error.
| -rw-r--r-- | drivers/ide/ide-dma.c | 4 | ||||
| -rw-r--r-- | include/asm-sh/scatterlist.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index 3f4d4e627..edaccf8e5 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c @@ -267,7 +267,7 @@ static int ide_raw_build_sglist (ide_hwif_t *hwif, struct request *rq) if (sector_count > 128) { memset(&sg[nents], 0, sizeof(*sg)); sg[nents].page = virt_to_page(virt_addr); - sg[nents].offset = ((unsigned long) virt_addr & ~PAGE_MASK); + sg[nents].offset = (unsigned long) virt_addr & ~PAGE_MASK; sg[nents].length = 128 * SECTOR_SIZE; nents++; virt_addr = virt_addr + (128 * SECTOR_SIZE); @@ -275,7 +275,7 @@ static int ide_raw_build_sglist (ide_hwif_t *hwif, struct request *rq) } memset(&sg[nents], 0, sizeof(*sg)); sg[nents].page = virt_to_page(virt_addr); - sg[nents].offset = ((unsigned long) virt_addr & ~PAGE_MASK); + sg[nents].offset = (unsigned long) virt_addr & ~PAGE_MASK; sg[nents].length = sector_count * SECTOR_SIZE; nents++; #endif diff --git a/include/asm-sh/scatterlist.h b/include/asm-sh/scatterlist.h index b580e05d0..7b91df140 100644 --- a/include/asm-sh/scatterlist.h +++ b/include/asm-sh/scatterlist.h @@ -2,8 +2,9 @@ #define __ASM_SH_SCATTERLIST_H struct scatterlist { - struct page *page; - unsigned int offset; + struct page * page; /* Location for highmem page, if any */ + unsigned int offset;/* for highmem, page offset */ + dma_addr_t dma_address; unsigned int length; }; |