Message ID | 1376049119-12655-4-git-send-email-m.szyprowski@samsung.com |
---|---|
State | New |
Headers | show
Return-Path: <patchwork-forward+bncBDG6PF6SSYDRBD5QSOIAKGQEPNDDKNQ@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f71.google.com (mail-qe0-f71.google.com [209.85.128.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4011B25A57 for <linaro@patches.linaro.org>; Fri, 9 Aug 2013 11:52:48 +0000 (UTC) Received: by mail-qe0-f71.google.com with SMTP id 1sf4989229qee.2 for <linaro@patches.linaro.org>; Fri, 09 Aug 2013 04:52:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=msjvfZNbi60iPzjT2gj1y7UKydBYgtXtcbZnHwpzKy0=; b=J4qvlXDeuczinDBPiXVx6PEppQwgbckUHGM0LBVhojg9ky74pACUI3A1uZcexO1iiG 4uhtUc4o+vjdVz2KXbeWM/pwzYKusQYFJ19ubk3vKmP2k0TYWUAX+S9Zdan1FeZ6e5Kx wZOu5QYFGjIDLIvzIeCYVTbTTKl8Y9O2i66w+szntYPY5/2ve1ryWUxNe1Dns5FRtDm+ xUi8iv7OGYBQ+McuDtsN2cq7JX1S2/v0EjntzyVimTmeTneyK1TYUktMMO1r5+yMPwGo GNNa8kAp8FU9EZwHQs845XcR/cOxXscYdeddVXcbVR15brQderJ4y6xqx+GsTfrnfSYP gbzw== X-Received: by 10.236.92.7 with SMTP id i7mr5181759yhf.52.1376049167913; Fri, 09 Aug 2013 04:52:47 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.121.195 with SMTP id lm3ls1460157qeb.89.gmail; Fri, 09 Aug 2013 04:52:47 -0700 (PDT) X-Received: by 10.58.85.161 with SMTP id i1mr5443555vez.97.1376049167728; Fri, 09 Aug 2013 04:52:47 -0700 (PDT) Received: from mail-vb0-f49.google.com (mail-vb0-f49.google.com [209.85.212.49]) by mx.google.com with ESMTPS id x16si4519607vcu.25.2013.08.09.04.52.47 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 09 Aug 2013 04:52:47 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.49 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.49; Received: by mail-vb0-f49.google.com with SMTP id w16so3997522vbb.36 for <patchwork-forward@linaro.org>; Fri, 09 Aug 2013 04:52:47 -0700 (PDT) X-Gm-Message-State: ALoCoQlF2nZZLzrvi9kyafDhLalkumFyx2kp0mEqZILl1b3cD6DlCRwWkcuCxeQ/Gko87FH8PZ/g X-Received: by 10.52.243.201 with SMTP id xa9mr114888vdc.106.1376049167383; Fri, 09 Aug 2013 04:52:47 -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.220.174.196 with SMTP id u4csp68737vcz; Fri, 9 Aug 2013 04:52:46 -0700 (PDT) X-Received: by 10.14.107.2 with SMTP id n2mr12658954eeg.122.1376049166308; Fri, 09 Aug 2013 04:52:46 -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 k49si15336095een.142.2013.08.09.04.52.45 for <multiple recipients> (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 09 Aug 2013 04:52:46 -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 1V7lF3-0007lu-2b; Fri, 09 Aug 2013 11:52:25 +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 1V7lF1-0007lZ-Hd for linaro-mm-sig@lists.linaro.org; Fri, 09 Aug 2013 11:52:23 +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 <0MR9007XNIBOWLK0@mailout3.samsung.com> for linaro-mm-sig@lists.linaro.org; Fri, 09 Aug 2013 20:52:36 +0900 (KST) X-AuditID: cbfee61a-b7f196d000007dfa-ad-5204d803f6b3 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 71.30.32250.308D4025; Fri, 09 Aug 2013 20:52:36 +0900 (KST) Received: from localhost.localdomain ([106.116.147.30]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MR900DY2IAQ4070@mmp2.samsung.com>; Fri, 09 Aug 2013 20:52:35 +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: Fri, 09 Aug 2013 13:51:59 +0200 Message-id: <1376049119-12655-4-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1376049119-12655-1-git-send-email-m.szyprowski@samsung.com> References: <1376049119-12655-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRmVeSWpSXmKPExsVy+t9jQV2WGyxBBguOMln8nXSM3WL+kXOs Fq/ObGSzeNPbwWJxtukNu8X2zhnsFl+uPGSy2PT4GqvF2iN32S02vDzIZLH0+kUmiwXHW1gt /kyXszh1/TObxYTpa1ksvn/7xmbxd/smFovDb9qBxh1sY7FYP+M1i4OIx5p5axg9fv+axOjx evIERo/Lfb1MHjtn3WX32Lyk3uP2v8fMHldONLF6rPvzismj/6+BR9+WVYweP1/qeHzeJOex cW5oAF8Ul01Kak5mWWqRvl0CV0bH1PWMBUfYK57tb2BuYFzG1sXIwSEhYCLR8Ya1i5ETyBST uHBvPVCYi0NIYDqjxJvP75ggnHYmiT/HHrODVLEJGEp0ve1iA7FFBNIkZqzawAJSxCywiFXi zJ/NYKOEBaIl2hatYAHZwCKgKjHlmz1ImFfAQ+LUi72MEIsVJOZMsgEJcwp4SnztWcIIYgsB leyaPZt1AiPvAkaGVYyiqQXJBcVJ6bmGesWJucWleel6yfm5mxjBUfJMagfjygaLQ4wCHIxK PLyK25mDhFgTy4orcw8xSnAwK4nwbp/AEiTEm5JYWZValB9fVJqTWnyIUZqDRUmc90CrdaCQ QHpiSWp2ampBahFMlomDU6qBsTp6SnyE1H+u5hAvtpZ4PpWM/vvT1e0FBFemN99lS3kWYbtu 4jqFLRe8Z86+/GpzyvIv61vLg7bICumcfngsvydAS8Hm6C6RwFbTN6UFrd+X5eb9TBCeLq0g /8jhd9bPrR6rbPuaNZmOxFdWcD6+9W43A0vWthTJ/RF66wpqFnmJRVr/PXdeiaU4I9FQi7mo OBEAge6/LY4CAAA= Cc: Mark Rutland <mark.rutland@arm.com>, Pawel Moll <pawel.moll@arm.com>, Arnd Bergmann <arnd@arndb.de>, Stephen Warren <swarren@wwwdotorg.org>, 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>, Ian Campbell <ian.campbell@citrix.com>, Sascha Hauer <s.hauer@pengutronix.de> Subject: [Linaro-mm-sig] [PATCH v5 3/3] 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-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.49 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..7c1c4b2 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -17,6 +17,7 @@ #include <linux/nodemask.h> #include <linux/initrd.h> #include <linux/of_fdt.h> +#include <linux/of_reserved_mem.h> #include <linux/highmem.h> #include <linux/gfp.h> #include <linux/memblock.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