patch-2.4.0-test6 linux/arch/i386/mm/ioremap.c

Next file: linux/arch/ia64/ia32/binfmt_elf32.c
Previous file: linux/arch/i386/mm/init.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test5/linux/arch/i386/mm/ioremap.c linux/arch/i386/mm/ioremap.c
@@ -121,15 +121,14 @@
 	 */
 	if (phys_addr < virt_to_phys(high_memory)) {
 		char *t_addr, *t_end;
-		int i;
+		struct page *page;
 
 		t_addr = __va(phys_addr);
 		t_end = t_addr + (size - 1);
 	   
-		for(i = MAP_NR(t_addr); i < MAP_NR(t_end); i++) {
-			if(!PageReserved(mem_map + i))
+		for(page = virt_to_page(t_addr); page < virt_to_page(t_end); page++)
+			if(!PageReserved(page))
 				return NULL;
-		}
 	}
 
 	/*

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