From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757326Ab1LNOBd (ORCPT ); Wed, 14 Dec 2011 09:01:33 -0500 Received: from mail-iy0-f174.google.com ([209.85.210.174]:56233 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757247Ab1LNOB3 (ORCPT ); Wed, 14 Dec 2011 09:01:29 -0500 From: Ming Lei To: Mauro Carvalho Chehab , Tony Lindgren Cc: Sylwester Nawrocki , Alan Cox , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Ming Lei Subject: [RFC PATCH v2 3/8] media: videobuf2: move out of setting pgprot_noncached from vb2_mmap_pfn_range Date: Wed, 14 Dec 2011 22:00:09 +0800 Message-Id: <1323871214-25435-4-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1323871214-25435-1-git-send-email-ming.lei@canonical.com> References: <1323871214-25435-1-git-send-email-ming.lei@canonical.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org So that we can reuse vb2_mmap_pfn_range for the coming videobuf2_page memops. Signed-off-by: Ming Lei --- drivers/media/video/videobuf2-dma-contig.c | 1 + drivers/media/video/videobuf2-memops.c | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/videobuf2-dma-contig.c b/drivers/media/video/videobuf2-dma-contig.c index f17ad98..0ea8866 100644 --- a/drivers/media/video/videobuf2-dma-contig.c +++ b/drivers/media/video/videobuf2-dma-contig.c @@ -106,6 +106,7 @@ static int vb2_dma_contig_mmap(void *buf_priv, struct vm_area_struct *vma) return -EINVAL; } + vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); return vb2_mmap_pfn_range(vma, buf->dma_addr, buf->size, &vb2_common_vm_ops, &buf->handler); } diff --git a/drivers/media/video/videobuf2-memops.c b/drivers/media/video/videobuf2-memops.c index 71a7a78..77e0def 100644 --- a/drivers/media/video/videobuf2-memops.c +++ b/drivers/media/video/videobuf2-memops.c @@ -162,7 +162,6 @@ int vb2_mmap_pfn_range(struct vm_area_struct *vma, unsigned long paddr, size = min_t(unsigned long, vma->vm_end - vma->vm_start, size); - vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); ret = remap_pfn_range(vma, vma->vm_start, paddr >> PAGE_SHIFT, size, vma->vm_page_prot); if (ret) { -- 1.7.5.4