From patchwork Tue May 31 14:45:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Scheurer, Amber" X-Patchwork-Id: 832792 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4VEjqxb018876 for ; Tue, 31 May 2011 14:45:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754549Ab1EaOpt (ORCPT ); Tue, 31 May 2011 10:45:49 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:38786 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752315Ab1EaOpt (ORCPT ); Tue, 31 May 2011 10:45:49 -0400 Received: from dlep34.itg.ti.com ([157.170.170.115]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id p4VEjelH013498 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 31 May 2011 09:45:40 -0500 Received: from dlep26.itg.ti.com (smtp-le.itg.ti.com [157.170.170.27]) by dlep34.itg.ti.com (8.13.7/8.13.8) with ESMTP id p4VEjegd016453; Tue, 31 May 2011 09:45:40 -0500 (CDT) Received: from dlee74.ent.ti.com (localhost [127.0.0.1]) by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id p4VEjerP020133; Tue, 31 May 2011 09:45:40 -0500 (CDT) Received: from dlelxv23.itg.ti.com (172.17.1.198) by dlee74.ent.ti.com (157.170.170.8) with Microsoft SMTP Server id 8.3.106.1; Tue, 31 May 2011 09:45:39 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id p4VEjdoq032697; Tue, 31 May 2011 09:45:39 -0500 Received: from localhost (a0393674u.apr.dhcp.ti.com [172.24.137.179]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id p4VEjcf29999; Tue, 31 May 2011 09:45:38 -0500 (CDT) From: Amber Jain To: CC: hvaibhav@ti.com, sakari.ailus@iki.fi, Amber Jain Subject: [PATCH] V4L2: omap_vout: Remove GFP_DMA allocation as ZONE_DMA is not configured on OMAP Date: Tue, 31 May 2011 20:15:35 +0530 Message-ID: <1306853136-12106-1-git-send-email-amber@ti.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 31 May 2011 14:45:52 +0000 (UTC) Remove GFP_DMA from the __get_free_pages() call from omap_vout as ZONE_DMA is not configured on OMAP. Earlier the page allocator used to return a page from ZONE_NORMAL even when GFP_DMA is passed and CONFIG_ZONE_DMA is disabled. As a result of commit a197b59ae6e8bee56fcef37ea2482dc08414e2ac, page allocator returns null in such a scenario with a warning emitted to kernel log. Signed-off-by: Amber Jain --- drivers/media/video/omap/omap_vout.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c index 4ada9be..8cac624 100644 --- a/drivers/media/video/omap/omap_vout.c +++ b/drivers/media/video/omap/omap_vout.c @@ -181,7 +181,7 @@ static unsigned long omap_vout_alloc_buffer(u32 buf_size, u32 *phys_addr) size = PAGE_ALIGN(buf_size); order = get_order(size); - virt_addr = __get_free_pages(GFP_KERNEL | GFP_DMA, order); + virt_addr = __get_free_pages(GFP_KERNEL, order); addr = virt_addr; if (virt_addr) {