Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 289006
b: refs/heads/master
c: 4f8aae5
h: refs/heads/master
v: v3
  • Loading branch information
Víctor Manuel Jáquez Leal authored and Greg Kroah-Hartman committed Feb 9, 2012
1 parent 0c653b5 commit 98800db
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b8bfa4c57c003e85aefbc5aef14f1704ef37b403
refs/heads/master: 4f8aae5375e429b003a72a37d8ece6e1b99e486e
5 changes: 2 additions & 3 deletions trunk/drivers/staging/tidspbridge/rmgr/drv_interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -257,16 +257,15 @@ static long bridge_ioctl(struct file *filp, unsigned int code,
/* This function maps kernel space memory to user space memory. */
static int bridge_mmap(struct file *filp, struct vm_area_struct *vma)
{
u32 offset = vma->vm_pgoff << PAGE_SHIFT;
u32 status;

DBC_ASSERT(vma->vm_start < vma->vm_end);

vma->vm_flags |= VM_RESERVED | VM_IO;
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);

dev_dbg(bridge, "%s: vm filp %p offset %x start %lx end %lx page_prot "
"%ulx flags %lx\n", __func__, filp, offset,
dev_dbg(bridge, "%s: vm filp %p start %lx end %lx page_prot %ulx "
"flags %lx\n", __func__, filp,
vma->vm_start, vma->vm_end, vma->vm_page_prot,
vma->vm_flags);

Expand Down

0 comments on commit 98800db

Please sign in to comment.