diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 23:45:22 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 23:45:22 +0000 |
| commit | 5b35aa5cd29bb111d847b2a2ed18110acbfb1f44 (patch) | |
| tree | c7bbaa1137528330d3c74d14056ef7016a52be72 /drivers/char/bttv.c | |
| parent | 511bcd7c5924ce9e98ad1cb851988f7448dfef0f (diff) | |
Merge with Linux 2.3.24.
Diffstat (limited to 'drivers/char/bttv.c')
| -rw-r--r-- | drivers/char/bttv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/bttv.c b/drivers/char/bttv.c index ac21c68f0..17e87e7f8 100644 --- a/drivers/char/bttv.c +++ b/drivers/char/bttv.c @@ -121,8 +121,9 @@ static inline unsigned long uvirt_to_kva(pgd_t *pgd, unsigned long adr) 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)); |