Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753334AbeAEXVI (ORCPT + 1 other); 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 X-Google-Smtp-Source: ACJfBovj/yhEe7xpMUAbQJMwttQo1YbYK7UZ5QDG2RwM57ztwiU1ceZP0qsksZdUgkQvWigy/NyFOA== 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: 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(-) 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); -- 2.14.1