diff options
Diffstat (limited to 'drivers/char/mem.c')
-rw-r--r-- | drivers/char/mem.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index f182752fe918..9df928d4f68d 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c | |||
@@ -231,9 +231,7 @@ static ssize_t write_mem(struct file * file, const char __user * buf, | |||
231 | static int mmap_mem(struct file * file, struct vm_area_struct * vma) | 231 | static int mmap_mem(struct file * file, struct vm_area_struct * vma) |
232 | { | 232 | { |
233 | #if defined(__HAVE_PHYS_MEM_ACCESS_PROT) | 233 | #if defined(__HAVE_PHYS_MEM_ACCESS_PROT) |
234 | unsigned long offset = vma->vm_pgoff << PAGE_SHIFT; | 234 | vma->vm_page_prot = phys_mem_access_prot(file, vma->vm_pgoff, |
235 | |||
236 | vma->vm_page_prot = phys_mem_access_prot(file, offset, | ||
237 | vma->vm_end - vma->vm_start, | 235 | vma->vm_end - vma->vm_start, |
238 | vma->vm_page_prot); | 236 | vma->vm_page_prot); |
239 | #elif defined(pgprot_noncached) | 237 | #elif defined(pgprot_noncached) |