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/ieee1394 | |
| parent | a7ce7d5e94c98ef5b867f61b2ebecd563f4b6ec9 (diff) | |
Merge with Linux 2.4.0-test6-pre8.
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/video1394.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c index b42ce0b46..f43d82803 100644 --- a/drivers/ieee1394/video1394.c +++ b/drivers/ieee1394/video1394.c @@ -221,7 +221,7 @@ static void * rvmalloc(unsigned long size) 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; size-=PAGE_SIZE; } @@ -239,7 +239,7 @@ static void rvfree(void * mem, unsigned long size) 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; size-=PAGE_SIZE; } |