From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 1 Aug 2011 03:24:07 +0000 (+0800)
Subject: pmem: fix for v2.6.36
X-Git-Tag: firefly_0821_release~9800
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f00ac08e35653d8c56cd57d8bf9251824084eaae;p=firefly-linux-kernel-4.4.55.git

pmem: fix for v2.6.36
---

diff --git a/drivers/misc/pmem.c b/drivers/misc/pmem.c
index 547afd2ebdda..499507541a87 100644
--- 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;