Re: Alpha update for 2.5.3

Skip Ford
2002-02-08T01:59:04Z

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

Jeff Garzik wrote:
>
> Second comment, some of the bits in your patch are in 2.5.3-pre3. [but
> drivers/ide/ide-dma.c does not compile for me, unrelated to alpha...]

This patch Jens posted seems to fix it.

--
Skip

[-- Attachment #2: ide-dma.patch --]
[-- Type: text/plain, Size: 779 bytes --]

diff -Nru a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
--- a/drivers/ide/ide-dma.c Thu Feb 7 09:44:56 2002
+++ b/drivers/ide/ide-dma.c Thu Feb 7 09:44:56 2002
@@ -266,14 +266,16 @@
#if 1
if (sector_count > 128) {
memset(&sg[nents], 0, sizeof(*sg));
- sg[nents].address = virt_addr;
+ sg[nents].page = virt_to_page(virt_addr);
+ sg[nents].offset = (unsigned long) virt_addr & ~PAGE_MASK;
sg[nents].length = 128 * SECTOR_SIZE;
nents++;
virt_addr = virt_addr + (128 * SECTOR_SIZE);
sector_count -= 128;
}
memset(&sg[nents], 0, sizeof(*sg));
- sg[nents].address = virt_addr;
+ sg[nents].page = virt_to_page(virt_addr);
+ sg[nents].offset = (unsigned long) virt_addr & ~PAGE_MASK;
sg[nents].length = sector_count * SECTOR_SIZE;
nents++;
#endif