Message ID | 1375685624-12103-5-git-send-email-m.szyprowski@samsung.com |
---|---|
State | New |
Headers | show
Return-Path: <patchwork-forward+bncBDG6PF6SSYDRBOUY7WHQKGQE26ZG5SA@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f199.google.com (mail-ye0-f199.google.com [209.85.213.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7E41525E70 for <linaro@patches.linaro.org>; Mon, 5 Aug 2013 06:54:50 +0000 (UTC) Received: by mail-ye0-f199.google.com with SMTP id l12sf3623624yen.10 for <linaro@patches.linaro.org>; Sun, 04 Aug 2013 23:54:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to:x-auditid :from:to:date:message-id:x-mailer:in-reply-to:references :x-brightmail-tracker:cc:subject:x-beenthere:x-mailman-version :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:errors-to:sender :x-gm-message-state:x-removed-original-auth:x-original-sender :x-original-authentication-results:mailing-list:x-google-group-id :content-type:content-transfer-encoding; bh=jvUZ558I9yQ6uxgKKWz2XG5cOudt9kEgOqAd+G77LTc=; b=X2kv8ebAO3mIyCdDRUSpYrevn8PknvtoUZuO8V++SPmSUcZaFFLvG2prhG4QIlfah1 Du/lanqWXf2gUzWoeDBWUguXumMc8yAIN+3mL1cugjZPWj0/Bj9q73N6AHf7nqa1NzNu 9mPx5I3UYLGYbFXuj5ZzhoQ1C/6+s9YF4/QgbGRQNSKRgBeOmvS4ilN26eHIEilUd/34 cpKHAFVez+/MFXiKo/AP2dHX6c8MpzRFuK1bYAWI8T1ElBLpEq3qOZcVLm2Xv4Sre1rn HrmZEgVqHy9JJm4d83vFxDueqthJJXtQQH2S4OuMUrKzvynMUoopW4LrrhBwCtSw9zmQ F9cw== X-Received: by 10.236.190.72 with SMTP id d48mr7805262yhn.0.1375685690031; Sun, 04 Aug 2013 23:54:50 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.58.244 with SMTP id u20ls276931qeq.74.gmail; Sun, 04 Aug 2013 23:54:49 -0700 (PDT) X-Received: by 10.52.94.78 with SMTP id da14mr2037800vdb.28.1375685689919; Sun, 04 Aug 2013 23:54:49 -0700 (PDT) Received: from mail-ve0-f176.google.com (mail-ve0-f176.google.com [209.85.128.176]) by mx.google.com with ESMTPS id dc8si4701316vdc.57.2013.08.04.23.54.49 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 04 Aug 2013 23:54:49 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.176; Received: by mail-ve0-f176.google.com with SMTP id b10so2647962vea.21 for <patchwork-forward@linaro.org>; Sun, 04 Aug 2013 23:54:49 -0700 (PDT) X-Received: by 10.220.198.133 with SMTP id eo5mr5393632vcb.24.1375685689791; Sun, 04 Aug 2013 23:54:49 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.11.8 with SMTP id pc8csp72239vcb; Sun, 4 Aug 2013 23:54:49 -0700 (PDT) X-Received: by 10.180.10.202 with SMTP id k10mr5655260wib.17.1375685688893; Sun, 04 Aug 2013 23:54:48 -0700 (PDT) Received: from ip-10-141-164-156.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id r20si7157112wiw.28.2013.08.04.23.54.48 for <multiple recipients> (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 04 Aug 2013 23:54:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linaro-mm-sig-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-141-164-156.ec2.internal) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from <linaro-mm-sig-bounces@lists.linaro.org>) id 1V6Egb-0001oB-Ve; Mon, 05 Aug 2013 06:54:33 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from <m.szyprowski@samsung.com>) id 1V6Ega-0001nX-GB for linaro-mm-sig@lists.linaro.org; Mon, 05 Aug 2013 06:54:32 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MR100DSEPV2YYB0@mailout3.samsung.com> for linaro-mm-sig@lists.linaro.org; Mon, 05 Aug 2013 15:54:39 +0900 (KST) X-AuditID: cbfee61a-b7f196d000007dfa-fb-51ff4c2e0e0b Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 85.19.32250.E2C4FF15; Mon, 05 Aug 2013 15:54:38 +0900 (KST) Received: from localhost.localdomain ([106.116.147.30]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MR1001JGPTNTLG1@mmp1.samsung.com>; Mon, 05 Aug 2013 15:54:38 +0900 (KST) From: Marek Szyprowski <m.szyprowski@samsung.com> To: linux-arm-kernel@lists.infradead.org, linaro-mm-sig@lists.linaro.org, devicetree@vger.kernel.org Date: Mon, 05 Aug 2013 08:53:44 +0200 Message-id: <1375685624-12103-5-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1375685624-12103-1-git-send-email-m.szyprowski@samsung.com> References: <1375685624-12103-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrJLMWRmVeSWpSXmKPExsVy+t9jAV09n/+BBm/umlv8nXSM3WL+kXOs Fq/ObGSzONv0ht1ie+cMdosvVx4yWWx6fI3VYu2Ru+wWG14eZLJYcLyF1eLPdDmLU9c/s1l8 //aNzeLv9k0sFofftLNarJ/xmsVBwOP3r0mMHpf7epk8ds66y+6xeUm9x+1/j5k9rpxoYvVY 9+cVk0f/XwOPvi2rGD1+vtTx+LxJLoA7issmJTUnsyy1SN8ugSuj68wPloLfbBUXb59lamB8 zNrFyMkhIWAi0fx1NzOELSZx4d56ti5GLg4hgUWMEsffbmOGcNqZJOa//MUOUsUmYCjR9baL DcQWEUiTmLFqAwuIzSzQxiLxAsIWFoiWeLZ1BhOIzSKgKvFu/l+wDbwCHhJbFvYDbeYA2qYg MWeSDYjJKeApcfNZJkiFEFDFgv6TbBMYeRcwMqxiFE0tSC4oTkrPNdQrTswtLs1L10vOz93E CA7wZ1I7GFc2WBxiFOBgVOLhVWD/HyjEmlhWXJl7iFGCg1lJhJe9/2+gEG9KYmVValF+fFFp TmrxIUZpDhYlcd4DrdaBQgLpiSWp2ampBalFMFkmDk6pBsYOO8t32y7N3G/bkMV24EGWzqRd 8ulblgbtLWmfZ3hSPG1tUGD8ybunVrPfKGt52SZYN1WqJPLADnFX7wyWPP3Dgg89ykJsb8i0 WM3+PVN7Bttzn+Iw8YafTySqX1rxc79iOK/5XGujZhnv7l21fVtivth7Sq1a9yb5qML7cLfN ljNY3c82hiuxFGckGmoxFxUnAgAOP4YXbAIAAA== Cc: Arnd Bergmann <arnd@arndb.de>, Tomasz Figa <t.figa@samsung.com>, Michal Nazarewicz <mina86@mina86.com>, Grant Likely <grant.likely@secretlab.ca>, Kyungmin Park <kyungmin.park@samsung.com>, Rob Herring <robherring2@gmail.com>, Sylwester Nawrocki <s.nawrocki@samsung.com>, Olof Johansson <olof@lixom.net>, Sascha Hauer <s.hauer@pengutronix.de> Subject: [Linaro-mm-sig] [PATCH v4 4/4] ARM: init: add support for reserved memory defined by device tree X-BeenThere: linaro-mm-sig@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <http://lists.linaro.org/mailman/listinfo/linaro-mm-sig>, <mailto:linaro-mm-sig-request@lists.linaro.org?subject=subscribe> MIME-Version: 1.0 Errors-To: linaro-mm-sig-bounces@lists.linaro.org Sender: linaro-mm-sig-bounces@lists.linaro.org X-Gm-Message-State: ALoCoQkAuNhwgKghGhWMsOme7k8D3IzfaFIzwAiV3+8JdJFFjhvE+Yj5YeAuHfrcQBLoaRjITfEq X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: m.szyprowski@samsung.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit |
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 15225d8..82db8d8 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -20,6 +20,7 @@ #include <linux/highmem.h> #include <linux/gfp.h> #include <linux/memblock.h> +#include <linux/dma-mapping.h> #include <linux/dma-contiguous.h> #include <linux/sizes.h> @@ -377,6 +378,8 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc) if (mdesc->reserve) mdesc->reserve(); + dma_reserved_mem_of_reserve(); + /* * reserve memory for DMA contigouos allocations, * must come from DMA area inside low memory