From: Rob Herring <robh@kernel.org>
To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Frank Rowand <frowand.list@gmail.com>,
Chris Zankel <chris@zankel.net>,
Max Filippov <jcmvbkbc@gmail.com>,
linux-xtensa@linux-xtensa.org
Subject: [PATCH 7/7] xtensa: remove arch specific early DT functions
Date: Fri, 5 Jan 2018 17:20:54 -0600 [thread overview]
Message-ID: <20180105232054.27394-8-robh@kernel.org> (raw)
In-Reply-To: <20180105232054.27394-1-robh@kernel.org>
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(-)
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);
--
2.14.1
next prev parent reply other threads:[~2018-01-05 23:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-05 23:20 [PATCH 0/7] DT: consolidate bootmem support Rob Herring
2018-01-05 23:20 ` [PATCH 1/7] of/fdt: use memblock_virt_alloc for early alloc Rob Herring
2018-01-05 23:20 ` [PATCH 2/7] cris: remove arch specific early DT functions Rob Herring
2018-01-05 23:20 ` [PATCH 3/7] metag: " Rob Herring
2018-01-05 23:20 ` [PATCH 4/7] mips: remove arch specific early_init_dt_alloc_memory_arch Rob Herring
2018-01-05 23:20 ` [PATCH 5/7] nios2: " Rob Herring
2018-01-17 11:00 ` Tobias Klauser
2018-01-05 23:20 ` [PATCH 6/7] x86: " Rob Herring
2018-01-05 23:20 ` Rob Herring [this message]
2018-01-15 9:13 ` [PATCH 7/7] xtensa: remove arch specific early DT functions Max Filippov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180105232054.27394-8-robh@kernel.org \
--to=robh@kernel.org \
--cc=chris@zankel.net \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=jcmvbkbc@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).