patch-2.4.0-test6 linux/drivers/ieee1394/video1394.c

• Lines: 41
• Date: Mon Aug 7 21:01:36 2000
• Orig file: v2.4.0-test5/linux/drivers/ieee1394/video1394.c
• Orig date: Fri Jul 14 12:12:09 2000

diff -u --recursive --new-file v2.4.0-test5/linux/drivers/ieee1394/video1394.c linux/drivers/ieee1394/video1394.c
@@ -144,7 +144,7 @@
  */
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
-#define page_address(x)	(x)
+#define page_address(x)	((void *) (x))
 #endif
 
 /* Given PGD from the address space's page table, return the kernel
@@ -161,9 +161,10 @@
                 if (!pmd_none(*pmd)) {
                         ptep = pte_offset(pmd, adr);
                         pte = *ptep;
-                        if(pte_present(pte))
-				ret = (page_address(pte_page(pte))|
-				       (adr&(PAGE_SIZE-1)));
+                        if(pte_present(pte)) {
+				ret = (unsigned long) page_address(pte_page(pte));
+				ret |= (adr & (PAGE_SIZE - 1));
+			}
                 }
         }
         MDEBUG(printk("uv2kva(%lx-->%lx)", adr, ret));
@@ -220,7 +221,7 @@
 		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;
 		}
@@ -238,7 +239,7 @@
 		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;
 		}