Message ID | 1375275119-12787-5-git-send-email-m.szyprowski@samsung.com |
---|---|
State | New |
Headers | show
Return-Path: <patchwork-forward+bncBDG6PF6SSYDRBIUR4SHQKGQE65U2VXA@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-gh0-f197.google.com (mail-gh0-f197.google.com [209.85.160.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1A0CC246CC for <linaro@patches.linaro.org>; Wed, 31 Jul 2013 12:52:51 +0000 (UTC) Received: by mail-gh0-f197.google.com with SMTP id r20sf758499ghr.4 for <linaro@patches.linaro.org>; Wed, 31 Jul 2013 05:52: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=AVAC/7e1Qr1j0d59Ve1NMy07Jld0ZPlVqmG5+v1PNVrVIfvbALULguJIqRGr5BtdHM AWwjz0iB1c4IpgLFmulhG5XhdRnMGK8gv2jv1vLgnD4PHHkhhxMq1Et2WVS53bJtYu6R I4nfq1GkAm0llRWD3RJiYx/IRfkmPf+JhL4Cp5liWWJ1bNogbAnoOjd6kvFflWl0uVwo ITYq2dC3fWoaCM7EC9aQ61sZY0MXUuW2SuqicQGaHmbpJqVIDNYOJT/SxJNc/ejmkrF7 zn6HbBCfiDcVnxpJblW9/aXsuYtcK0rOGkTZN6pN2FSMSx1PNTkoqfgUUVOVFHB/XGC1 XChw== X-Received: by 10.236.190.72 with SMTP id d48mr11697589yhn.0.1375275170895; Wed, 31 Jul 2013 05:52:50 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.99.10 with SMTP id em10ls669754qeb.82.gmail; Wed, 31 Jul 2013 05:52:50 -0700 (PDT) X-Received: by 10.220.162.200 with SMTP id w8mr11518123vcx.90.1375275170784; Wed, 31 Jul 2013 05:52:50 -0700 (PDT) Received: from mail-vb0-f45.google.com (mail-vb0-f45.google.com [209.85.212.45]) by mx.google.com with ESMTPS id rx10si256242vdc.138.2013.07.31.05.52.50 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 31 Jul 2013 05:52:50 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.45 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.45; Received: by mail-vb0-f45.google.com with SMTP id e15so629384vbg.32 for <patchwork-forward@linaro.org>; Wed, 31 Jul 2013 05:52:50 -0700 (PDT) X-Received: by 10.58.154.34 with SMTP id vl2mr28990587veb.35.1375275170607; Wed, 31 Jul 2013 05:52:50 -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 pc8csp235056vcb; Wed, 31 Jul 2013 05:52:50 -0700 (PDT) X-Received: by 10.15.36.72 with SMTP id h48mr69256648eev.33.1375275169639; Wed, 31 Jul 2013 05:52:49 -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 a48si1345736eep.173.2013.07.31.05.52.39 for <multiple recipients> (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 31 Jul 2013 05:52:49 -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 1V4VtH-00044V-Mr; Wed, 31 Jul 2013 12:52:31 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from <m.szyprowski@samsung.com>) id 1V4VtF-00043q-VI for linaro-mm-sig@lists.linaro.org; Wed, 31 Jul 2013 12:52:30 +0000 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MQS00L7QX3G79Q0@mailout1.samsung.com> for linaro-mm-sig@lists.linaro.org; Wed, 31 Jul 2013 21:52:33 +0900 (KST) X-AuditID: cbfee61b-b7efe6d000007b11-24-51f9089163be Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id D8.0A.31505.19809F15; Wed, 31 Jul 2013 21:52:33 +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 <0MQS004JJX2O1G70@mmp1.samsung.com>; Wed, 31 Jul 2013 21:52:33 +0900 (KST) From: Marek Szyprowski <m.szyprowski@samsung.com> To: linux-arm-kernel@lists.infradead.org, linaro-mm-sig@lists.linaro.org, devicetree-discuss@lists.ozlabs.org Date: Wed, 31 Jul 2013 14:51:59 +0200 Message-id: <1375275119-12787-5-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1375275119-12787-1-git-send-email-m.szyprowski@samsung.com> References: <1375275119-12787-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrBLMWRmVeSWpSXmKPExsVy+t9jAd2JHD8DDdYvMLT4O+kYu8WB2Q9Z LV6d2chmcbbpDbvF9s4Z7BZfrjxkstj0+Bqrxdojd9ktNrw8yGSx4HgLq8Wf6XIWp65/ZrP4 /u0bm8Xf7ZtYLA6/aWe1WD/jNYuDgMfvX5MYPS739TJ57Jx1l91j85J6j9v/HjN7nJ+xkNHj yokmVo91f14xefT/NfDo27KK0ePnS50A7igum5TUnMyy1CJ9uwSujK4zP1gKfrNVXLx9lqmB 8TFrFyMnh4SAicTThd+ZIGwxiQv31rOB2EICixglDvZpdDFyAdntTBIvv2xjBkmwCRhKdL3t Airi4BARyJdYPYsXJMws0MYi8WIDC4gtLBAt8WzrDCaQEhYBVYnHs1JAwrwCHhLNtyeAdUoI KEjMmWQDEuYU8JQ4+HMP1FYPiWNzJ7JNYORdwMiwilE0tSC5oDgpPddIrzgxt7g0L10vOT93 EyM4vJ9J72Bc1WBxiFGAg1GJh3fGpe+BQqyJZcWVuYcYJTiYlUR497D+DBTiTUmsrEotyo8v Ks1JLT7EKM3BoiTOe7DVOlBIID2xJDU7NbUgtQgmy8TBKdXAGHrr57zfHU4K3zVy5qypnLJO uF769sedGpbNa45N3jRrweWzS74W2v4Pl6zbMDfn8zIfC23fWazmb+KL5vKtu7t8Zfdc81Pz ahQXLdVckrx3j66k8Pv2yffWnqlZW7uM7VtW6LGv/6o6p+rxv9jP0Pzd+Vi9yNcIucSAD/9z YrYvWSaVbq35WFKJpTgj0VCLuag4EQANssQZawIAAA== 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: ALoCoQm+EmSYL3QEuKbYg7hcq0qCK8R53T4y1ZEMoimkN3WV378EYiabMjr1pjqjkyhcPgSdSwUG 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.212.45 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