From patchwork Fri Oct 11 07:27:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 3021271 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9B3ADBF924 for ; Fri, 11 Oct 2013 07:41:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5FF752030D for ; Fri, 11 Oct 2013 07:41:26 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D93A820266 for ; Fri, 11 Oct 2013 07:41:24 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VUXLH-0000jb-Rp; Fri, 11 Oct 2013 07:40:59 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VUXLA-0007X0-UR; Fri, 11 Oct 2013 07:40:52 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VUXL2-0007VN-82 for linux-arm-kernel@lists.infradead.org; Fri, 11 Oct 2013 07:40:45 +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 linux-arm-kernel@lists.infradead.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 To: linux-arm-kernel@lists.infradead.org, linaro-mm-sig@lists.linaro.org, devicetree@vger.kernel.org Subject: [PATCH 1/2] Revert "ARM: init: add support for reserved memory defined by device tree" 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= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131011_034044_547192_38109628 X-CRM114-Status: UNSURE ( 9.50 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -7.1 (-------) Cc: Mark Rutland , Laura Abbott , Pawel Moll , Arnd Bergmann , Stephen Warren , Benjamin Herrenschmidt , Tomasz Figa , Tomasz Figa , Michal Nazarewicz , Grant Likely , Marc , Kyungmin Park , Sylwester Nawrocki , Kumar Gala , Olof Johansson , Ian Campbell , Nishanth Peethambaran , Sascha Hauer , Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- arch/arm/mm/init.c | 3 --- 1 file changed, 3 deletions(-) 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 #include #include -#include #include #include #include @@ -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