From 984760dbf5e48f6224dfe9e26e03536b3d38b6cd Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 8 Aug 2000 22:17:26 +0000 Subject: Merge with Linux 2.4.0-test6-pre8. --- drivers/usb/ibmcam.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/usb/ibmcam.c') 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; -- cgit v1.2.3