mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
[PATCH] /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 <bjorn.helgaas@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
a136564702
commit
44ac841390
1 changed files with 14 additions and 9 deletions
|
@ -228,20 +228,25 @@ static ssize_t write_mem(struct file * file, const char __user * buf,
|
|||
return written;
|
||||
}
|
||||
|
||||
#ifndef __HAVE_PHYS_MEM_ACCESS_PROT
|
||||
static pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
|
||||
unsigned long size, pgprot_t vma_prot)
|
||||
{
|
||||
#ifdef pgprot_noncached
|
||||
unsigned long offset = pfn << PAGE_SHIFT;
|
||||
|
||||
if (uncached_access(file, offset))
|
||||
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)
|
||||
vma->vm_page_prot = phys_mem_access_prot(file, vma->vm_pgoff,
|
||||
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,
|
||||
|
|
Loading…
Reference in a new issue