From patchwork Thu Nov 11 01:50:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: omar ramirez X-Patchwork-Id: 316172 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 oAB2144P023570 for ; Thu, 11 Nov 2010 02:01:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932218Ab0KKCBD (ORCPT ); Wed, 10 Nov 2010 21:01:03 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:35366 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932192Ab0KKCBB (ORCPT ); Wed, 10 Nov 2010 21:01:01 -0500 Received: from dlep36.itg.ti.com ([157.170.170.91]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id oAB20k4d030106 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 10 Nov 2010 20:00:46 -0600 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id oAB20kWv017952; Wed, 10 Nov 2010 20:00:46 -0600 (CST) Received: from localhost (bacab.am.dhcp.ti.com [128.247.77.143]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id oAB20jf01953; Wed, 10 Nov 2010 20:00:45 -0600 (CST) From: Omar Ramirez Luna To: Greg Kroah-Hartman Cc: Tony Lindgren , Russell King , Felipe Contreras , Omar Ramirez Luna , Fernando Guzman Lugo , Rene Sapiens , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org Subject: [PATCH 01/02] omap: dsp: remove shm from normal memory Date: Wed, 10 Nov 2010 19:50:24 -0600 Message-Id: <1289440225-27221-2-git-send-email-omar.ramirez@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1289440225-27221-1-git-send-email-omar.ramirez@ti.com> References: <1289440225-27221-1-git-send-email-omar.ramirez@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 11 Nov 2010 02:01:04 +0000 (UTC) diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 6f42a18..fc81912 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -284,12 +284,14 @@ void __init omap_dsp_reserve_sdram_memblock(void) if (!size) return; - paddr = __memblock_alloc_base(size, SZ_1M, MEMBLOCK_REAL_LIMIT); + paddr = memblock_alloc(size, SZ_1M); if (!paddr) { pr_err("%s: failed to reserve %x bytes\n", __func__, size); return; } + memblock_free(paddr, size); + memblock_remove(paddr, size); omap_dsp_phys_mempool_base = paddr; }