| Message ID | 20180105232054.27394-8-robh@kernel.org |
|---|---|
| State | Accepted |
| Commit | 3a6fbcb2e2e4b263df1cc8647ce1858c57ddc805 |
| Headers | show |
| Series | DT: consolidate bootmem support | expand |
Hi Rob, On Fri, Jan 5, 2018 at 3:20 PM, Rob Herring <robh@kernel.org> wrote: > Now that the DT core code handles bootmem arches, we can remove the xtensa > specific early_init_dt_alloc_memory_arch function. The common > early_init_dt_add_memory_arch can be used too now that xtensa switched to > memblock. > > Cc: Chris Zankel <chris@zankel.net> > Cc: Max Filippov <jcmvbkbc@gmail.com> > Cc: linux-xtensa@linux-xtensa.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/xtensa/kernel/setup.c | 12 ------------ > 1 file changed, 12 deletions(-) Acked-by: Max Filippov <jcmvbkbc@gmail.com> -- Thanks. -- Max -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 08175df7a69e..82bd1a94157c 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -20,7 +20,6 @@ #include <linux/mm.h> #include <linux/proc_fs.h> #include <linux/screen_info.h> -#include <linux/bootmem.h> #include <linux/kernel.h> #include <linux/percpu.h> #include <linux/cpu.h> @@ -218,17 +217,6 @@ static int __init xtensa_dt_io_area(unsigned long node, const char *uname, } #endif -void __init early_init_dt_add_memory_arch(u64 base, u64 size) -{ - size &= PAGE_MASK; - memblock_add(base, size); -} - -void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) -{ - return __alloc_bootmem(size, align, 0); -} - void __init early_init_devtree(void *params) { early_init_dt_scan(params);
Now that the DT core code handles bootmem arches, we can remove the xtensa specific early_init_dt_alloc_memory_arch function. The common early_init_dt_add_memory_arch can be used too now that xtensa switched to memblock. Cc: Chris Zankel <chris@zankel.net> Cc: Max Filippov <jcmvbkbc@gmail.com> Cc: linux-xtensa@linux-xtensa.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/xtensa/kernel/setup.c | 12 ------------ 1 file changed, 12 deletions(-) -- 2.14.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html