patch-2.4.0-test6 linux/drivers/char/zr36120_mem.c

Next file: linux/drivers/fc4/Makefile
Previous file: linux/drivers/char/tda9875.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test5/linux/drivers/char/zr36120_mem.c linux/drivers/char/zr36120_mem.c
@@ -50,7 +50,7 @@
 	if (mem) {
 		unsigned long adr = (unsigned long)mem;
 		while (size > 0) {
-			mem_map_reserve(MAP_NR(phys_to_virt(adr)));
+			mem_map_reserve(virt_to_page(phys_to_virt(adr)));
 			adr += PAGE_SIZE;
 			size -= PAGE_SIZE;
 		}
@@ -64,7 +64,7 @@
 		unsigned long adr = (unsigned long)mem;
 		unsigned long siz = size;
 		while (siz > 0) {
-			mem_map_unreserve(MAP_NR(phys_to_virt(adr)));
+			mem_map_unreserve(virt_to_page(phys_to_virt(adr)));
 			adr += PAGE_SIZE;
 			siz -= PAGE_SIZE;
 		}

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)