From patchwork Sun Nov 7 21:43:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 307342 X-Patchwork-Delegate: tony@atomide.com 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 oA7LiKcR029968 for ; Sun, 7 Nov 2010 21:44:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753467Ab0KGVoT (ORCPT ); Sun, 7 Nov 2010 16:44:19 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:44122 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751711Ab0KGVoT (ORCPT ); Sun, 7 Nov 2010 16:44:19 -0500 Received: by mail-fx0-f46.google.com with SMTP id 16so3600214fxm.19 for ; Sun, 07 Nov 2010 13:44:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=qr5/wcI9X3OgBr6KfHmD4ysbpx3EydJu3Jh2tfwqStA=; b=a1CmVEtJzMzYp0smJCmz33nxoW9p2bo3QAeedZAHwCzovT7KoO7hGEyurS/Mxo7pnQ Tf13J8cXvXIp4msMVx2CtjmTtaksPN7D32URZXayPK+G006v3TXEv9zpoufUwhdlUgpd Vqr2EPY3FY/qP/hsRnGFl4/Hmnvhop1JgFXRQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=jJ5yr2Vd5WU2frg0X7Rx9S+OW4RDSGAwLmG+icX5HrTejz8n7BxVqfmu5CHaTFgL5z GgjRfjUa9KOlXqeCj2bocil7T4+M/rO58LKC1qTAw2tQQERjCzAAbHEMWf8hic8cSCol LFOHajFPBh5Buyi/wNINROXAvs7dN990A4xmc= Received: by 10.223.73.199 with SMTP id r7mr3119726faj.76.1289166258508; Sun, 07 Nov 2010 13:44:18 -0800 (PST) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id k21sm1783477faa.25.2010.11.07.13.44.09 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 07 Nov 2010 13:44:17 -0800 (PST) From: Felipe Contreras To: linux-omap , Greg KH Cc: Omar Ramirez Luna , Tony Lindgren , Paul Walmsley , Fernando Guzman Lugo , Felipe Contreras Subject: [PATCH 1/5] omap: dsp: remove shm from normal memory Date: Sun, 7 Nov 2010 23:43:25 +0200 Message-Id: <1289166209-32251-2-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.7.3.2.3.gf8529 In-Reply-To: References: 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]); Sun, 07 Nov 2010 21:44:20 +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; }