patch-2.3.24 linux/drivers/char/bttv.c

• Lines: 11
• Date: Mon Oct 25 08:26:53 1999
• Orig file: v2.3.23/linux/drivers/char/bttv.c
• Orig date: Fri Oct 15 15:25:13 1999

diff -u --recursive --new-file v2.3.23/linux/drivers/char/bttv.c linux/drivers/char/bttv.c
@@ -121,8 +121,9 @@
                 if (!pmd_none(*pmd)) {
                         ptep = pte_offset(pmd, adr);
                         pte = *ptep;
+                        /* Note; page_address will panic for us if the page is high */
                         if(pte_present(pte))
-                                ret = (pte_page(pte)|(adr&(PAGE_SIZE-1)));
+                                ret = page_address(pte_page(pte))|(adr&(PAGE_SIZE-1));
                 }
         }
         MDEBUG(printk("uv2kva(%lx-->%lx)", adr, ret));