From aae6d10d1b7717047d80cb050382edca9f994c38 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Mon, 1 Aug 2011 11:19:42 +0800 Subject: [PATCH] rk29: vpu_mem: fix for v2.6.36 --- arch/arm/mach-rk29/vpu_mem.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-rk29/vpu_mem.c b/arch/arm/mach-rk29/vpu_mem.c index 89e8e968d64c..608c4e1d94f7 100644 --- a/arch/arm/mach-rk29/vpu_mem.c +++ b/arch/arm/mach-rk29/vpu_mem.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -841,7 +842,7 @@ void vpu_mem_cache_opt(struct file *file, long index, unsigned int cmd) up_read(&vdm_rwsem); } -static pgprot_t phys_mem_access_prot(struct file *file, pgprot_t vma_prot) +static pgprot_t vpu_mem_phys_mem_access_prot(struct file *file, pgprot_t vma_prot) { #ifdef pgprot_noncached if (vpu_mem.cached == 0 || file->f_flags & O_SYNC) @@ -918,7 +919,7 @@ static int vpu_mem_mmap(struct file *file, struct vm_area_struct *vma) } vma->vm_pgoff = vpu_mem.base >> PAGE_SHIFT; - vma->vm_page_prot = phys_mem_access_prot(file, vma->vm_page_prot); + vma->vm_page_prot = vpu_mem_phys_mem_access_prot(file, vma->vm_page_prot); if (vpu_mem_map_pfn_range(vma, vma_size)) { printk(KERN_INFO "vpu_mem: mmap failed in kernel!\n"); -- 2.34.1