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 | |
| parent | 511bcd7c5924ce9e98ad1cb851988f7448dfef0f (diff) | |
Merge with Linux 2.3.24.
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/bttv.c | 3 | ||||
| -rw-r--r-- | drivers/char/drm/proc.c | 2 | ||||
| -rw-r--r-- | drivers/char/serial.c | 1 |
3 files changed, 4 insertions, 2 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)); diff --git a/drivers/char/drm/proc.c b/drivers/char/drm/proc.c index 7db90aea8..666b6e5ac 100644 --- a/drivers/char/drm/proc.c +++ b/drivers/char/drm/proc.c @@ -393,7 +393,7 @@ static int _drm_vma_info(char *buf, char **start, off_t offset, int len, pgprot & _PAGE_PCD ? 'u' : 'c', pgprot & _PAGE_ACCESSED ? 'a' : '-', pgprot & _PAGE_DIRTY ? 'd' : '-', - pgprot & _PAGE_4M ? 'm' : 'k', + pgprot & _PAGE_PSE ? 'm' : 'k', pgprot & _PAGE_GLOBAL ? 'g' : 'l' ); #endif DRM_PROC_PRINT("\n"); diff --git a/drivers/char/serial.c b/drivers/char/serial.c index 38bbf438b..45193f9ce 100644 --- a/drivers/char/serial.c +++ b/drivers/char/serial.c @@ -158,6 +158,7 @@ #ifdef LOCAL_HEADERS #include "serial_local.h" #else +#include <linux/serialP.h> #include <linux/serial.h> #include <linux/serial_reg.h> #include <asm/serial.h> |