pmem: fix for v2.6.36

diff --git a/drivers/misc/pmem.c b/drivers/misc/pmem.c
index 547afd2ebdda6bc3266c9f14909f304c95bb1590..499507541a87037b8ed64393e3b8c24e6ebe4446 100644 (file)
--- a/drivers/misc/pmem.c
+++ b/drivers/misc/pmem.c
@@ -438,7 +438,7 @@ static int pmem_allocate(int id, unsigned long len)
        return best_fit;
 }
 
-static pgprot_t phys_mem_access_prot(struct file *file, pgprot_t vma_prot)
+static pgprot_t pmem_phys_mem_access_prot(struct file *file, pgprot_t vma_prot)
 {
        int id = get_id(file);
 #ifdef pgprot_noncached
@@ -628,7 +628,7 @@ static int pmem_mmap(struct file *file, struct vm_area_struct *vma)
        }
 
        vma->vm_pgoff = pmem_start_addr(id, data) >> PAGE_SHIFT;
-       vma->vm_page_prot = phys_mem_access_prot(file, vma->vm_page_prot);
+       vma->vm_page_prot = pmem_phys_mem_access_prot(file, vma->vm_page_prot);
 
        if (data->flags & PMEM_FLAGS_CONNECTED) {
                struct pmem_region_node *region_node;