Messages in this thread Patch in this message | | | From | Rob Herring <> | Subject | [PATCH 6/7] x86: remove arch specific early_init_dt_alloc_memory_arch | Date | Fri, 5 Jan 2018 17:20:53 -0600 |
| |
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 <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: x86@kernel.org Signed-off-by: Rob Herring <robh@kernel.org> --- 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 <linux/bootmem.h> #include <linux/export.h> #include <linux/io.h> #include <linux/interrupt.h> @@ -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
| |