|
@@ -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,
|