| Message ID | 1381476448-14548-2-git-send-email-m.szyprowski@samsung.com |
|---|---|
| State | Accepted |
| Commit | cebf3e40b01bbf88d38dc954397414afaa280023 |
| Headers | show
Return-Path: <patchwork-forward+bncBDG6PF6SSYDRB6GW32JAKGQEMMF7JTA@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8296D25EA1 for <linaro@patches.linaro.org>; Fri, 11 Oct 2013 07:40:40 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id e14sf6308764iej.0 for <linaro@patches.linaro.org>; Fri, 11 Oct 2013 00:40:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; 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=V0zEA6axMVq+n5bvFOJ65v9+I4MAdIQzH8fJgSyDfyI=; b=iE5naQVqilzKBbHo1nImRjDX2nRcwApkVQMGPIIM2poNfaxcSMp3Dzkzy6i9rsRDSS X8PaZB9z7wsBqICnADKGartsvb7KgrGRrfVk41mBYM9FkUFwxWOCWQgrH3t1R9kkNKT9 jlpU26vUAtq/4zRyhCEFy4c/kCZxgY6EMG3KdpCO5WuDqXYhjoNQm/Yg/JaV09VCEn+t OSeGDIz93Dzc2k2D3fh7WLs2M3fEWH615gnj4CDYHvDsXkWETEX24SAJwKeW10r/bZAF Ufd+E9qibvCCNVyJKCtmfph8H0dJL1NTOguUcIWuBOXfH0E3nzVKQPJr6xFkBaBbi7qA tPLQ== X-Received: by 10.182.165.8 with SMTP id yu8mr6034939obb.31.1381477240144; Fri, 11 Oct 2013 00:40:40 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.74.35 with SMTP id q3ls1400801qev.50.gmail; Fri, 11 Oct 2013 00:40:40 -0700 (PDT) X-Received: by 10.52.35.20 with SMTP id d20mr13638519vdj.33.1381477240040; Fri, 11 Oct 2013 00:40:40 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id dt10si16202477vdb.60.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Oct 2013 00:40:40 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id hu8so2537874vcb.3 for <patchwork-forward@linaro.org>; Fri, 11 Oct 2013 00:40:39 -0700 (PDT) X-Gm-Message-State: ALoCoQnHMyl2VvNSGWOzZ2HmV3H/B7FSrqEaOzV861T8PbVSerLNILYqko5cfopSgAy3NUa/Plvd X-Received: by 10.220.98.70 with SMTP id p6mr6886vcn.59.1381477239903; Fri, 11 Oct 2013 00:40:39 -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 u4csp16712vcz; Fri, 11 Oct 2013 00:40:39 -0700 (PDT) X-Received: by 10.194.93.105 with SMTP id ct9mr16130195wjb.6.1381477238566; Fri, 11 Oct 2013 00:40:38 -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 o12si590602wiv.18.2013.10.11.00.40.37 for <multiple recipients> (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 11 Oct 2013 00:40:38 -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 1VUXJ9-0008KN-KQ; Fri, 11 Oct 2013 07:38:47 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from <m.szyprowski@samsung.com>) id 1VUXJ2-0008Jz-Qe for linaro-mm-sig@lists.linaro.org; Fri, 11 Oct 2013 07:38:41 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MUH000XHUN3F380@mailout2.samsung.com> for linaro-mm-sig@lists.linaro.org; Fri, 11 Oct 2013 16:40:22 +0900 (KST) X-AuditID: cbfee61a-b7f7a6d00000235f-85-5257ab659cb3 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id B5.80.09055.56BA7525; Fri, 11 Oct 2013 16:40:22 +0900 (KST) Received: from amdc1339.mshome.net ([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 <0MUH00BJRUMLBN10@mmp2.samsung.com>; Fri, 11 Oct 2013 16:40:21 +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, 11 Oct 2013 09:27:27 +0200 Message-id: <1381476448-14548-2-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1381476448-14548-1-git-send-email-m.szyprowski@samsung.com> References: <1381476448-14548-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuplkeLIzCtJLcpLzFFi42I5/e+xoG7a6vAgg65ci7+TjrFbfGhqZbaY f+Qcq0X/m4WsFq/ObGSzeNPbwWJxtukNu8X2zhnsFl+uPGSy2PT4GqvF2iN32S02vDzIZLH0 +kUmiwXHW1gt/kyXszh1/TObxYTpa1ksvn/7xmbxd/smFovDb9qBxh1sY7FYP+M1i8WqXX8Y HcQ91sxbw+jx+9ckRo/Xkycwelzu62Xy2DnrLrtHz5sWVo/NS+o9bv97zOxx5UQTq8e6P6+Y PPr/Gnj0bVnF6PHzpY7H501yHhvnhgbwR3HZpKTmZJalFunbJXBl7LjWzF6wk71ifVsTUwPj VLYuRk4OCQETiUf3etkhbDGJC/fWg8WFBKYzSpzrtO5i5AKyW5kkdh6awQySYBMwlOh62wVW JCKQJjFj1QYWEJtZYCGbxIlXpSC2sECixOMjXYwgNouAqsTDhxPAenkFPCTWbOgFqucAWqYg MWeSDUiYU8BTomvOJnaQsBBQyfqHwhMYeRcwMqxiFE0tSC4oTkrPNdQrTswtLs1L10vOz93E CI6kZ1I7GFc2WBxiFOBgVOLhffA3LEiINbGsuDL3EKMEB7OSCO+++eFBQrwpiZVVqUX58UWl OanFhxilOViUxHkPtFoHCgmkJ5akZqemFqQWwWSZODilGhh3Xug677ItJ+7jsn/iCp0SPfm/ 3LWKVglJJViWZ8u8nbjzZeQR/qK/kbelDi9nETu/xmpOJG+NybtLjD7ym5SZTPa0zAvaViB/ sv355IqNoZNLGO5Ilyk9/ZC0pjb+VZ9b2tQ95tpTXK/9Leq6IF33Puq3x7bFF29P057auYz9 kOae8ItHbVYpsRRnJBpqMRcVJwIAu7itIKACAAA= Cc: Mark Rutland <mark.rutland@arm.com>, Pawel Moll <pawel.moll@arm.com>, Arnd Bergmann <arnd@arndb.de>, Stephen Warren <swarren@wwwdotorg.org>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Tomasz Figa <t.figa@samsung.com>, Tomasz Figa <tomasz.figa@gmail.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>, Kumar Gala <galak@codeaurora.org>, Olof Johansson <olof@lixom.net>, Ian Campbell <ian.campbell@citrix.com>, Sascha Hauer <s.hauer@pengutronix.de> Subject: [Linaro-mm-sig] [PATCH 1/2] Revert "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.220.172 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 febaee7..18ec4c5 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -17,7 +17,6 @@ #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> @@ -379,8 +378,6 @@ void __init arm_memblock_init(struct meminfo *mi, if (mdesc->reserve) mdesc->reserve(); - early_init_dt_scan_reserved_mem(); - /* * reserve memory for DMA contigouos allocations, * must come from DMA area inside low memory
This reverts commit 10bcdfb8ba24760f715f0a700c3812747eddddf5. There is no consensus on the bindings for the reserved memory, so the code for handing it will be reverted. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- arch/arm/mm/init.c | 3 --- 1 file changed, 3 deletions(-)