diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2006-01-08 01:04:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 20:14:02 -0800 |
| commit | 44ac8413901167589226abf824d994aa57e4fd28 (patch) | |
| tree | e84b213b960a5b309e426860701e60d98fbb05a5 /drivers/char/mem.c | |
| parent | a1365647022eb05a5993f270a78e9bef3bf554eb (diff) | |
| download | op-kernel-dev-44ac8413901167589226abf824d994aa57e4fd28.zip op-kernel-dev-44ac8413901167589226abf824d994aa57e4fd28.tar.gz | |
[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>
Diffstat (limited to 'drivers/char/mem.c')
| -rw-r--r-- | drivers/char/mem.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index a85f3a3..ce3ff86 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -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, |
