From patchwork Wed Apr 23 01:18:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 4037271 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DC2719F391 for ; Wed, 23 Apr 2014 01:21:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 710BE20179 for ; Wed, 23 Apr 2014 01:21:46 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8C43920176 for ; Wed, 23 Apr 2014 01:21:41 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WclqJ-0001fN-9e; Wed, 23 Apr 2014 01:19:19 +0000 Received: from mail-ob0-x22f.google.com ([2607:f8b0:4003:c01::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WclqF-0001ZR-Ur for linux-arm-kernel@lists.infradead.org; Wed, 23 Apr 2014 01:19:16 +0000 Received: by mail-ob0-f175.google.com with SMTP id wp4so300835obc.6 for ; Tue, 22 Apr 2014 18:18:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=L/7IEoWAxmFDRAMrjoXYB0yRYn2t3VFa0BmjFnGTZbc=; b=g27Txzwpucbe4dM5gZt+5McdNX1QbzN/u9ls9HsLIwu9EtGI43B1E/cwgGXTa3W5X/ ojUG/SjIKyjk8z7fk42t2aoEwLrqpx3dc4F4KbpTqh/e2FDrcFtNsAV8p4xOBykWmrtv ecrqqCYdN5zEQyfbJ+jX5Z2EOUn7NK7Cyq9t1kj4kflxzZLGXp81h67Qt2CQE3SCS9ph bVJQGSkX0x+kxyNevrVczD3nr1lDnc9lsNbwVLGe1OS3SFP3p9oK6KZf3C+1/qDac6Gt qXnLsSTbZS52OlDGhzf1V+8TGwBbAEJpAow58LIwDX9446Pmjs4pkk/fo3frXD4tyrS1 3ZTA== X-Received: by 10.60.146.201 with SMTP id te9mr34964108oeb.38.1398215934816; Tue, 22 Apr 2014 18:18:54 -0700 (PDT) Received: from localhost.localdomain (72-48-77-163.dyn.grandenetworks.net. [72.48.77.163]) by mx.google.com with ESMTPSA id f1sm184735295oej.5.2014.04.22.18.18.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Apr 2014 18:18:53 -0700 (PDT) From: Rob Herring To: Grant Likely , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 05/21] ARM: dt: use default early_init_dt_alloc_memory_arch Date: Tue, 22 Apr 2014 20:18:05 -0500 Message-Id: <1398215901-25609-6-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1398215901-25609-1-git-send-email-robherring2@gmail.com> References: <1398215901-25609-1-git-send-email-robherring2@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140422_181916_046522_0E42A1F1 X-CRM114-Status: UNSURE ( 9.51 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.1 (/) Cc: Rob Herring , Russell King , linux-arm-kernel@lists.infradead.org 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=-2.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 From: Rob Herring Now that ARM is using memblock instead of bootmem, the default version of early_init_dt_alloc_memory_arch can be used. Signed-off-by: Rob Herring Cc: Russell King Cc: linux-arm-kernel@lists.infradead.org --- v2: no change arch/arm/kernel/devtree.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c index c7419a5..dff9cc0 100644 --- a/arch/arm/kernel/devtree.c +++ b/arch/arm/kernel/devtree.c @@ -32,11 +32,6 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size) arm_add_memory(base, size); } -void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) -{ - return memblock_virt_alloc(size, align); -} - void __init arm_dt_memblock_reserve(void) { u64 *reserve_map, base, size;