From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Hutchings Subject: [PATCH 3/8] drm: Do not include page offset in argument to virt_to_page() Date: Wed, 21 Dec 2011 01:33:24 +0000 Message-ID: <1324431204.2844.148.camel@deadeye> References: <1324430940.2844.144.camel@deadeye> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from shadbolt.e.decadent.org.uk (shadbolt.e.decadent.org.uk [88.96.1.126]) by gabe.freedesktop.org (Postfix) with ESMTP id 31AE49E807 for ; Tue, 20 Dec 2011 17:33:29 -0800 (PST) In-Reply-To: <1324430940.2844.144.camel@deadeye> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: David Airlie , dri-devel@lists.freedesktop.org Cc: LKML List-Id: dri-devel@lists.freedesktop.org By definition, the page offset will not affect the result. Compile-tested only. Signed-off-by: Ben Hutchings --- drivers/gpu/drm/drm_vm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index 8c03eaf..98c3922 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c @@ -306,7 +306,7 @@ static int drm_do_vm_dma_fault(struct vm_area_struct *vma, struct vm_fault *vmf) offset = (unsigned long)vmf->virtual_address - vma->vm_start; /* vm_[pg]off[set] should be 0 */ page_nr = offset >> PAGE_SHIFT; /* page_nr could just be vmf->pgoff */ - page = virt_to_page((dma->pagelist[page_nr] + (offset & (~PAGE_MASK)))); + page = virt_to_page(dma->pagelist[page_nr]); get_page(page); vmf->page = page; -- 1.7.7.3