github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-09 07:03:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

rk29: vpu_mem: fix for v2.6.36

Browse Source
This commit is contained in:
黄涛 2011-08-01 11:19:42 +08:00
parent 9495362ae1
commit aae6d10d1b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-rk29/vpu_mem.c
View File

@ -22,6 +22,7 @@
#include <linux/debugfs.h>
#include <linux/mempolicy.h>
#include <linux/sched.h>
#include <linux/dma-mapping.h>
#include <asm/io.h>
#include <asm/uaccess.h>
#include <asm/cacheflush.h>
@ -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");