From 98800db9bb467437173ed32a06f3f2ea8daaf498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Tue, 31 Jan 2012 00:12:23 +0100 Subject: [PATCH] --- yaml --- r: 289006 b: refs/heads/master c: 4f8aae5375e429b003a72a37d8ece6e1b99e486e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/tidspbridge/rmgr/drv_interface.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index baa549f4c965..51dcd733867e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8bfa4c57c003e85aefbc5aef14f1704ef37b403 +refs/heads/master: 4f8aae5375e429b003a72a37d8ece6e1b99e486e diff --git a/trunk/drivers/staging/tidspbridge/rmgr/drv_interface.c b/trunk/drivers/staging/tidspbridge/rmgr/drv_interface.c index 97c40ffd844a..5f810b64f9a5 100644 --- a/trunk/drivers/staging/tidspbridge/rmgr/drv_interface.c +++ b/trunk/drivers/staging/tidspbridge/rmgr/drv_interface.c @@ -257,7 +257,6 @@ 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); @@ -265,8 +264,8 @@ static int bridge_mmap(struct file *filp, struct vm_area_struct *vma) 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);