From patchwork Fri Jan 5 23:20:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 123566 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp1402220qgn; Fri, 5 Jan 2018 15:21:10 -0800 (PST) X-Google-Smtp-Source: ACJfBosw1zCEOtmUz6nCuAW+XADfBhoeYzTcPrTEFLxgPP7s0vhA66GxjppISIejCmPZHy8copcy X-Received: by 10.99.9.67 with SMTP id 64mr2111857pgj.257.1515194470569; Fri, 05 Jan 2018 15:21:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515194470; cv=none; d=google.com; s=arc-20160816; b=hbTasjoiNjr9j8yN2PkRpinXqxPtlUbGb54vBZ6wOxyp0Q5cZmZX5xVl/B2Dlg3axj AXXQ9+RtbmsdIygtI7NgFT2pQzFqhaJB852kyJvOMJg3ZAuac6nOWVRh7c0Trr1dMRZN G2o+Ekxuolk2J5NaIWI+dYbz/rMSbenKN3R6IszQYwt7l1iM9EKRfowwmtPv2kp/g9vC 0ayHp0v2KIWhHoNU8vZy3JRvo/NmFxV1N0kgcahHgARiDQLZxKdbK757Xsc9ra8lhs8J vjDfpl8Z0kyS4JIVq2l7H9ubiTLEIHhj+nqCIifHjsMVlgJ3V+1zBmAUAWkIUNP8l2Bd dV5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=pMTx9nf8Kxj9iJQGT654zXlb+0A7X8mCeWrjtE9R/EI=; b=pPPCGIz66NGvYHf5Rv5yAijQnI27aLmRzyukWCNO9tQkRaLnAPWCDZgArs1izJQTbP QeSHs9Lyc6rl12+j9OJaxZ8QsisyS3D3lH53Xv/xSt10/nrp4vhGiJ74KZi//XBwS0c3 sDX29wrhYvx5+6tMjw5BZj9W3NKKcMuzWflOjjB0WVSUo/dZ9gDqL78PIasHDfe8+/x7 t1tqyNPY2gAWnzfQUJw3j79PeteXDdkfyRBBpyZezC0ZadNhxpwKrZ0JIHS3EKXl8B4x uwA0f44p6tZRz4LAOKybu+O75a1r7LDDbERbIuilzMcjdNvgnBIkiiLoKG0CW+8w80QO URkg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f5si4707866plf.151.2018.01.05.15.21.10; Fri, 05 Jan 2018 15:21:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753334AbeAEXVI (ORCPT + 28 others); Fri, 5 Jan 2018 18:21:08 -0500 Received: from mail-ot0-f193.google.com ([74.125.82.193]:36045 "EHLO mail-ot0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752612AbeAEXVE (ORCPT ); Fri, 5 Jan 2018 18:21:04 -0500 Received: by mail-ot0-f193.google.com with SMTP id w4so5170770otg.3; Fri, 05 Jan 2018 15:21:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pMTx9nf8Kxj9iJQGT654zXlb+0A7X8mCeWrjtE9R/EI=; b=PiJUQ2YShMyBjHSa7EOkz0vKbD3myKBeVsIxvB4EfH5trvpB/kRc9aHWUW8bGnxcMB ndiaDNgCfTDFvPMCW9756KSq9Ha9nA8befWZXdKb0+B4ya3P2ZK7cv0/d8V+ZrBoKAMl ppaMwhhXKM4zJPjIEiBHdX/S3ixEk+25a5G8sUdq4x98uUpgqarl1eeVM4cxReVVyJog ynv3imT0y0nwwX87WXS7W+7CXrLSLlTxbeACR24rm3c4Opm4FXFMA752RDwnb8kQXPlp 3dOjzhSaxwMGM17XiQTcv/zkuudKKgwZbserYLrYtAi81g/r7IiAaZLCX3T4FDxwpdJQ uxUA== X-Gm-Message-State: AKwxytc/xtRC6R9f1MMAIO0XozKZ9z0txq3uz4HsojdGkCygTI/oXfbi 4IYbHVqSM1cSAXihKlETUQn/wzY= X-Received: by 10.157.22.132 with SMTP id c4mr2969426ote.381.1515194463974; Fri, 05 Jan 2018 15:21:03 -0800 (PST) Received: from xps15.usacommunications.tv (216-188-254-6.dyn.grandenetworks.net. [216.188.254.6]) by smtp.googlemail.com with ESMTPSA id u1sm1969998otc.3.2018.01.05.15.21.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jan 2018 15:21:03 -0800 (PST) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Frank Rowand , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org Subject: [PATCH 6/7] x86: remove arch specific early_init_dt_alloc_memory_arch Date: Fri, 5 Jan 2018 17:20:53 -0600 Message-Id: <20180105232054.27394-7-robh@kernel.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180105232054.27394-1-robh@kernel.org> References: <20180105232054.27394-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that the DT core code handles bootmem arches, we can remove the x86 specific early_init_dt_alloc_memory_arch function. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: x86@kernel.org Signed-off-by: Rob Herring --- This is dependent on patch 1. Please ack and I'll take or apply after 4.16-rc1. arch/x86/kernel/devicetree.c | 6 ------ 1 file changed, 6 deletions(-) -- 2.14.1 diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c index 76e07698e6d1..25de5f6ca997 100644 --- a/arch/x86/kernel/devicetree.c +++ b/arch/x86/kernel/devicetree.c @@ -2,7 +2,6 @@ /* * Architecture specific OF callbacks. */ -#include #include #include #include @@ -39,11 +38,6 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size) BUG(); } -void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) -{ - return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS)); -} - void __init add_dtb(u64 data) { initial_dtb = data + offsetof(struct setup_data, data);