/dev/mem __HAVE_PHYS_MEM_ACCESS_PROT tidy-up
PATCH 1/1 /dev/mem __HAVE_PHYS_MEM_ACCESS_PROT tidy-up
Tidy up __HAVE_PHYS_MEM_ACCESS_PROT usage to make mmap_mem() easier to read.
Signed-off-by Bjorn Helgaas <[email protected]>
drivers/char/mem.c +12 -9
@@ -228,22 +228,25 @@return written; } +#ifndef __HAVE_PHYS_MEM_ACCESS_PROT +static pgprot_t phys_mem_access_prot (struct file *file,unsigned long addr, +unsigned long size,pgprot_t vma_prot) +{ +#ifdef pgprot_noncached +if (uncached_access (file, addr)) +return pgprot_noncached (vma_prot); +#endif +return vma_prot; +} +#endif +static int mmap_mem (struct file * file,struct vm_area_struct * vma) { -#if defined(__HAVE_PHYS_MEM_ACCESS_PROT)unsigned long offset = vma->vm_pgoff <<PAGE_SHIFT ; vma->vm_page_prot =phys_mem_access_prot (file, offset, vma->vm_end - vma->vm_start, vma->vm_page_prot); -#elif defined(pgprot_noncached) -unsigned long offset = vma->vm_pgoff <<PAGE_SHIFT ; -int uncached; - - uncached =uncached_access (file, offset); -if (uncached) - vma->vm_page_prot =pgprot_noncached (vma->vm_page_prot); -#endif /* Remap-pfn-range will mark the range VM_IO and VM_RESERVED */ if (remap_pfn_range(vma,