diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
| commit | 57445428488a2862840c4d7c96d7746c11031aaf (patch) | |
| tree | 60b88b3a21896a33ee4dccc727d88b745a9ff731 /drivers/ieee1394/video1394.c | |
| parent | 2e837819b1563679b55363d469239fdf4f17fbbb (diff) | |
Merge with Linu 2.4.0-test6-pre6.
Diffstat (limited to 'drivers/ieee1394/video1394.c')
| -rw-r--r-- | drivers/ieee1394/video1394.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c index 9afbb58ec..b42ce0b46 100644 --- a/drivers/ieee1394/video1394.c +++ b/drivers/ieee1394/video1394.c @@ -144,7 +144,7 @@ static struct video_template video_tmpl = { irq_handler }; */ #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 @@ static inline unsigned long uvirt_to_kva(pgd_t *pgd, unsigned long adr) 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)); |