diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 22:17:26 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 22:17:26 +0000 |
| commit | 984760dbf5e48f6224dfe9e26e03536b3d38b6cd (patch) | |
| tree | a99674322e524c4c90009b3bdae5fab0eebf2094 /drivers/usb | |
| parent | a7ce7d5e94c98ef5b867f61b2ebecd563f4b6ec9 (diff) | |
Merge with Linux 2.4.0-test6-pre8.
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/audio.c | 4 | ||||
| -rw-r--r-- | drivers/usb/ibmcam.c | 4 | ||||
| -rw-r--r-- | drivers/usb/ov511.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/audio.c b/drivers/usb/audio.c index 5d6def562..3efd73183 100644 --- a/drivers/usb/audio.c +++ b/drivers/usb/audio.c @@ -422,7 +422,7 @@ static void dmabuf_release(struct dmabuf *db) for(nr = 0; nr < NRSGBUF; nr++) { if (!(p = db->sgbuf[nr])) continue; - mem_map_unreserve(MAP_NR(p)); + mem_map_unreserve(virt_to_page(p)); free_page((unsigned long)p); db->sgbuf[nr] = NULL; } @@ -464,7 +464,7 @@ static int dmabuf_init(struct dmabuf *db) if (!p) return -ENOMEM; db->sgbuf[nr] = p; - mem_map_reserve(MAP_NR(p)); + mem_map_reserve(virt_to_page(p)); } memset(db->sgbuf[nr], AFMT_ISUNSIGNED(db->format) ? 0x80 : 0, PAGE_SIZE); if ((nr << PAGE_SHIFT) >= db->dmasize) diff --git a/drivers/usb/ibmcam.c b/drivers/usb/ibmcam.c index 86360f687..806c9834d 100644 --- a/drivers/usb/ibmcam.c +++ b/drivers/usb/ibmcam.c @@ -268,7 +268,7 @@ static void *rvmalloc(unsigned long size) adr = (unsigned long) mem; while (size > 0) { page = kvirt_to_pa(adr); - mem_map_reserve(MAP_NR(__va(page))); + mem_map_reserve(virt_to_page(__va(page))); adr += PAGE_SIZE; if (size > PAGE_SIZE) size -= PAGE_SIZE; @@ -292,7 +292,7 @@ static void rvfree(void *mem, unsigned long size) adr=(unsigned long) mem; while (size > 0) { page = kvirt_to_pa(adr); - mem_map_unreserve(MAP_NR(__va(page))); + mem_map_unreserve(virt_to_page(__va(page))); adr += PAGE_SIZE; if (size > PAGE_SIZE) size -= PAGE_SIZE; diff --git a/drivers/usb/ov511.c b/drivers/usb/ov511.c index 055099a0c..8f32026f2 100644 --- a/drivers/usb/ov511.c +++ b/drivers/usb/ov511.c @@ -248,7 +248,7 @@ static void *rvmalloc(unsigned long size) adr = (unsigned long) mem; while (size > 0) { page = kvirt_to_pa(adr); - mem_map_reserve(MAP_NR(__va(page))); + mem_map_reserve(virt_to_page(__va(page))); adr += PAGE_SIZE; if (size > PAGE_SIZE) size -= PAGE_SIZE; @@ -272,7 +272,7 @@ static void rvfree(void *mem, unsigned long size) adr=(unsigned long) mem; while (size > 0) { page = kvirt_to_pa(adr); - mem_map_unreserve(MAP_NR(__va(page))); + mem_map_unreserve(virt_to_page(__va(page))); adr += PAGE_SIZE; if (size > PAGE_SIZE) size -= PAGE_SIZE; |