diff options
Diffstat (limited to 'include/asm-mips/pgtable.h')
-rw-r--r-- | include/asm-mips/pgtable.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/include/asm-mips/pgtable.h b/include/asm-mips/pgtable.h index dbe13da0bdad..eaf5d9b3a0e1 100644 --- a/include/asm-mips/pgtable.h +++ b/include/asm-mips/pgtable.h | |||
@@ -68,6 +68,8 @@ extern unsigned long zero_page_mask; | |||
68 | #define ZERO_PAGE(vaddr) \ | 68 | #define ZERO_PAGE(vaddr) \ |
69 | (virt_to_page(empty_zero_page + (((unsigned long)(vaddr)) & zero_page_mask))) | 69 | (virt_to_page(empty_zero_page + (((unsigned long)(vaddr)) & zero_page_mask))) |
70 | 70 | ||
71 | #define __HAVE_ARCH_MULTIPLE_ZERO_PAGE | ||
72 | |||
71 | extern void paging_init(void); | 73 | extern void paging_init(void); |
72 | 74 | ||
73 | /* | 75 | /* |
@@ -358,16 +360,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, | |||
358 | extern phys_t fixup_bigphys_addr(phys_t phys_addr, phys_t size); | 360 | extern phys_t fixup_bigphys_addr(phys_t phys_addr, phys_t size); |
359 | extern int remap_pfn_range(struct vm_area_struct *vma, unsigned long from, unsigned long pfn, unsigned long size, pgprot_t prot); | 361 | extern int remap_pfn_range(struct vm_area_struct *vma, unsigned long from, unsigned long pfn, unsigned long size, pgprot_t prot); |
360 | 362 | ||
361 | static inline int io_remap_page_range(struct vm_area_struct *vma, | ||
362 | unsigned long vaddr, | ||
363 | unsigned long paddr, | ||
364 | unsigned long size, | ||
365 | pgprot_t prot) | ||
366 | { | ||
367 | phys_t phys_addr_high = fixup_bigphys_addr(paddr, size); | ||
368 | return remap_pfn_range(vma, vaddr, phys_addr_high >> PAGE_SHIFT, size, prot); | ||
369 | } | ||
370 | |||
371 | static inline int io_remap_pfn_range(struct vm_area_struct *vma, | 363 | static inline int io_remap_pfn_range(struct vm_area_struct *vma, |
372 | unsigned long vaddr, | 364 | unsigned long vaddr, |
373 | unsigned long pfn, | 365 | unsigned long pfn, |
@@ -378,8 +370,6 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma, | |||
378 | return remap_pfn_range(vma, vaddr, pfn, size, prot); | 370 | return remap_pfn_range(vma, vaddr, pfn, size, prot); |
379 | } | 371 | } |
380 | #else | 372 | #else |
381 | #define io_remap_page_range(vma, vaddr, paddr, size, prot) \ | ||
382 | remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot) | ||
383 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ | 373 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ |
384 | remap_pfn_range(vma, vaddr, pfn, size, prot) | 374 | remap_pfn_range(vma, vaddr, pfn, size, prot) |
385 | #endif | 375 | #endif |