From patchwork Thu Apr 3 22:16:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 3934141 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 2AA31BFF02 for ; Thu, 3 Apr 2014 22:18:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6915E20225 for ; Thu, 3 Apr 2014 22:18:42 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 76CB920222 for ; Thu, 3 Apr 2014 22:18:41 +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 1WVpxb-0004LD-BR; Thu, 03 Apr 2014 22:18:11 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WVpxU-0007wW-Cn; Thu, 03 Apr 2014 22:18:04 +0000 Received: from mail-ob0-x234.google.com ([2607:f8b0:4003:c01::234]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WVpxK-0007uZ-IE for linux-arm-kernel@lists.infradead.org; Thu, 03 Apr 2014 22:17:55 +0000 Received: by mail-ob0-f180.google.com with SMTP id wn1so2696541obc.11 for ; Thu, 03 Apr 2014 15:17:33 -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=ukXA4ROlRXjMCP60ZzFgSDaJk95Q44EanRwAsA9eX6I=; b=0S12EecWlJleHVZM1g8M4/oEuMpD96Av9KbyGGI+kXVtyPTGsfnHI39YytVGpp32u9 OurHbZH4FQxVZFP/GmdsbH35TB8RDF17ZqkRSFKkGSsIkkH7B0XaqzbPGsmOrleYqJOB Fj8xG9O1lWbjAhPxv9Vbh6iO06qTdbH/wcZm7HcM0zGcdjmUyGrOfmx0pbCqd9aOxstI gF7oXq5xx3W3DsPzkvXlMkBg3kEvbzD22kAPuEeVJ/qo15pq4dg+aIhqKZWbkM9pDB9l EJyaK5qVzQf2adMRuAR9YcXkcwMFhoJXe2tMoJ5jEzw1csTFyTVul82pUD5tuO7etr6E JW/w== X-Received: by 10.60.39.131 with SMTP id p3mr8739622oek.44.1396563453463; Thu, 03 Apr 2014 15:17:33 -0700 (PDT) Received: from localhost.localdomain (72-48-77-163.dyn.grandenetworks.net. [72.48.77.163]) by mx.google.com with ESMTPSA id dh8sm27577997oeb.10.2014.04.03.15.17.31 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Apr 2014 15:17:32 -0700 (PDT) From: Rob Herring To: linux-kernel@vger.kernel.org Subject: [PATCH 05/20] ARM: dt: use default early_init_dt_alloc_memory_arch Date: Thu, 3 Apr 2014 17:16:48 -0500 Message-Id: <1396563423-30893-6-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1396563423-30893-1-git-send-email-robherring2@gmail.com> References: <1396563423-30893-1-git-send-email-robherring2@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140403_181754_659909_7857EE95 X-CRM114-Status: UNSURE ( 9.81 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.8 (-) Cc: Grant Likely , 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=-4.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 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 --- 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;