From patchwork Tue Oct 19 07:37:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 264791 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 o9J7bjNF026182 for ; Tue, 19 Oct 2010 07:37:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933414Ab0JSHho (ORCPT ); Tue, 19 Oct 2010 03:37:44 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:58656 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755871Ab0JSHhn (ORCPT ); Tue, 19 Oct 2010 03:37:43 -0400 Received: by mail-bw0-f46.google.com with SMTP id 10so56549bwz.19 for ; Tue, 19 Oct 2010 00:37:42 -0700 (PDT) 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=ey/HyVXAZG0WcZbLjjvzZOMossnKUzwbMgSQs0pK04c=; b=RgJrWmPx+QdRYM2dGHgMOGZ2BxWNox4Gcd3fjaN8dvFWsQ2vXd6XbFeHs1BlsT7kTn 4TKZLzkESpdK2HZMGNcsXHnms0FH0BcTmOJew77uumSeOQTligSVipVay/hokiRVBCAy GMyOZLuYkUo1FqpdMOHMwekynvwfIrVH/ScB4= 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=hnBrfeHI3LfDtdtQtdTHLbuNjK3AiSSXJoNHtuGtuxjLfv8xdTpdtRZBNjtCQDPAX4 mvpbtF1m9hdvenTZSRtoCr+lxqrnEewhdKDKqzRCUKHwVOlLZHYqnPvxYC2CWxBuPJY6 dorYUAH8B6Dh0/cRdeIh1iPfKbgodGw+2HQSU= Received: by 10.204.123.137 with SMTP id p9mr5262294bkr.206.1287473862805; Tue, 19 Oct 2010 00:37:42 -0700 (PDT) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id p34sm15496548bkf.3.2010.10.19.00.37.41 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 19 Oct 2010 00:37:42 -0700 (PDT) From: Felipe Contreras To: linux-omap Cc: Greg KH , Omar Ramirez Luna , Tony Lindgren , Russell King , Felipe Contreras Subject: [PATCH] omap: dsp: remove shm from normal memory Date: Tue, 19 Oct 2010 10:37:24 +0300 Message-Id: <1287473844-6228-2-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.7.3.1.2.g7fe2b In-Reply-To: <1287473844-6228-1-git-send-email-felipe.contreras@gmail.com> References: <1287473844-6228-1-git-send-email-felipe.contreras@gmail.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]); Tue, 19 Oct 2010 07:37:45 +0000 (UTC) diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 4c8f9b9..da10433 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -285,12 +285,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; }